[pypy-commit] pypy py3k: merge default

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r62919:0aa3b8f0a520
Date: 2013-04-01 17:09 -0700
http://bitbucket.org/pypy/pypy/changeset/0aa3b8f0a520/

Log:	merge default

diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py
--- a/pypy/config/pypyoption.py
+++ b/pypy/config/pypyoption.py
@@ -33,7 +33,7 @@
      "crypt", "signal", "_rawffi", "termios", "zlib", "bz2",
      "struct", "_hashlib", "_md5", "_minimal_curses",
      "thread", "itertools", "pyexpat", "_ssl", "cpyext", "array",
-     "_bisect", "binascii", "_multiprocessing", '_warnings',
+     "binascii", "_multiprocessing", '_warnings',
      "_collections", "_multibytecodec", "_ffi",
      "_continuation", "_csv", "_cffi_backend", # "micronumpy",
      "_posixsubprocess",
diff --git a/pypy/doc/config/objspace.usemodules._bisect.txt b/pypy/doc/config/objspace.usemodules._bisect.txt
deleted file mode 100644
--- a/pypy/doc/config/objspace.usemodules._bisect.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Use the '_bisect' module.
-Used, optionally,  by the 'bisect' standard lib module. This module is expected to be working and is included by default.
-
-
diff --git a/pypy/doc/cpython_differences.rst b/pypy/doc/cpython_differences.rst
--- a/pypy/doc/cpython_differences.rst
+++ b/pypy/doc/cpython_differences.rst
@@ -21,7 +21,6 @@
     __builtin__
     `__pypy__`_
     _ast
-    _bisect
     _codecs
     _collections
     `_continuation`_
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py b/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_optimizeopt.py
@@ -7,7 +7,7 @@
 from rpython.jit.metainterp.history import AbstractDescr, ConstInt, BoxInt
 from rpython.jit.metainterp.history import TreeLoop
 from rpython.jit.metainterp import compile, resume
-from rpython.jit.metainterp.resoperation import rop, opname, opargnum
+from rpython.jit.metainterp.resoperation import rop, opname, oparity
 from rpython.jit.metainterp.optimizeopt.test.test_optimizebasic import FakeMetaInterpStaticData
 
 def test_build_opt_chain():
@@ -188,7 +188,7 @@
             if 'FLOAT' in op:
                 continue
             args = []
-            for _ in range(opargnum[opnum]):
+            for _ in range(oparity[opnum]):
                 args.append(random.randrange(1, 20))
             ops = """
             []
diff --git a/rpython/jit/metainterp/resoperation.py b/rpython/jit/metainterp/resoperation.py
--- a/rpython/jit/metainterp/resoperation.py
+++ b/rpython/jit/metainterp/resoperation.py
@@ -21,6 +21,7 @@
     name = ""
     pc = 0
     opnum = 0
+    _cls_has_bool_result = False
 
     _attrs_ = ('result',)
 
@@ -172,12 +173,7 @@
         return rop._FINAL_FIRST <= self.getopnum() <= rop._FINAL_LAST
 
     def returns_bool_result(self):
-        opnum = self.getopnum()
-        if we_are_translated():
-            assert opnum >= 0
-        elif opnum < 0:
-            return False     # for tests
-        return opboolresult[opnum]
+        return self._cls_has_bool_result
 
 
 # ===================
@@ -550,11 +546,9 @@
     pass
 
 opclasses = []   # mapping numbers to the concrete ResOp class
-opargnum  = []   # mapping numbers to number or args (or -1)
 opname = {}      # mapping numbers to the original names, for debugging
 oparity = []     # mapping numbers to the arity of the operation or -1
 opwithdescr = [] # mapping numbers to a flag "takes a descr"
-opboolresult= [] # mapping numbers to a flag "returns a boolean"
 
 
 def setup(debug_print=False):
@@ -576,14 +570,13 @@
         if not name.startswith('_'):
             opname[i] = name
             cls = create_class_for_op(name, i, arity, withdescr)
+            cls._cls_has_bool_result = boolresult
         else:
             cls = None
         opclasses.append(cls)
-        opargnum.append(arity)
         oparity.append(arity)
         opwithdescr.append(withdescr)
-        opboolresult.append(boolresult)
-    assert len(opclasses)==len(oparity)==len(opwithdescr)==len(opboolresult)==len(_oplist)
+    assert len(opclasses)==len(oparity)==len(opwithdescr)==len(_oplist)
 
 def get_base_class(mixin, base):
     try: