[pypy-commit] pypy py3k: merge default

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k
Changeset: r65507:6ea19b5c2a9c
Date: 2013-07-19 19:59 -0700
http://bitbucket.org/pypy/pypy/changeset/6ea19b5c2a9c/

Log:	merge default

diff --git a/pypy/module/__pypy__/test/test_intop.py b/pypy/module/__pypy__/test/test_intop.py
--- a/pypy/module/__pypy__/test/test_intop.py
+++ b/pypy/module/__pypy__/test/test_intop.py
@@ -5,41 +5,41 @@
 
     def w_intmask(self, n):
         import sys
-        n &= (sys.maxint*2+1)
-        if n > sys.maxint:
-            n -= 2*(sys.maxint+1)
+        n &= (sys.maxsize*2+1)
+        if n > sys.maxsize:
+            n -= 2*(sys.maxsize+1)
         return int(n)
 
     def test_intmask(self):
         import sys
-        assert self.intmask(sys.maxint) == sys.maxint
-        assert self.intmask(sys.maxint+1) == -sys.maxint-1
-        assert self.intmask(-sys.maxint-2) == sys.maxint
+        assert self.intmask(sys.maxsize) == sys.maxsize
+        assert self.intmask(sys.maxsize+1) == -sys.maxsize-1
+        assert self.intmask(-sys.maxsize-2) == sys.maxsize
         N = 2 ** 128
-        assert self.intmask(N+sys.maxint) == sys.maxint
-        assert self.intmask(N+sys.maxint+1) == -sys.maxint-1
-        assert self.intmask(N-sys.maxint-2) == sys.maxint
+        assert self.intmask(N+sys.maxsize) == sys.maxsize
+        assert self.intmask(N+sys.maxsize+1) == -sys.maxsize-1
+        assert self.intmask(N-sys.maxsize-2) == sys.maxsize
 
     def test_int_add(self):
         import sys
         from __pypy__ import intop
         assert intop.int_add(40, 2) == 42
-        assert intop.int_add(sys.maxint, 1) == -sys.maxint-1
-        assert intop.int_add(-2, -sys.maxint) == sys.maxint
+        assert intop.int_add(sys.maxsize, 1) == -sys.maxsize-1
+        assert intop.int_add(-2, -sys.maxsize) == sys.maxsize
 
     def test_int_sub(self):
         import sys
         from __pypy__ import intop
         assert intop.int_sub(40, -2) == 42
-        assert intop.int_sub(sys.maxint, -1) == -sys.maxint-1
-        assert intop.int_sub(-2, sys.maxint) == sys.maxint
+        assert intop.int_sub(sys.maxsize, -1) == -sys.maxsize-1
+        assert intop.int_sub(-2, sys.maxsize) == sys.maxsize
 
     def test_int_mul(self):
         import sys
         from __pypy__ import intop
         assert intop.int_mul(40, -2) == -80
-        assert intop.int_mul(-sys.maxint, -sys.maxint) == (
-            self.intmask(sys.maxint ** 2))
+        assert intop.int_mul(-sys.maxsize, -sys.maxsize) == (
+            self.intmask(sys.maxsize ** 2))
 
     def test_int_floordiv(self):
         import sys
@@ -48,8 +48,8 @@
         assert intop.int_floordiv(41, -3) == -13
         assert intop.int_floordiv(-41, 3) == -13
         assert intop.int_floordiv(-41, -3) == 13
-        assert intop.int_floordiv(-sys.maxint, -1) == sys.maxint
-        assert intop.int_floordiv(sys.maxint, -1) == -sys.maxint
+        assert intop.int_floordiv(-sys.maxsize, -1) == sys.maxsize
+        assert intop.int_floordiv(sys.maxsize, -1) == -sys.maxsize
 
     def test_int_mod(self):
         import sys
@@ -58,26 +58,26 @@
         assert intop.int_mod(41, -3) == 2
         assert intop.int_mod(-41, 3) == -2
         assert intop.int_mod(-41, -3) == -2
-        assert intop.int_mod(-sys.maxint, -1) == 0
-        assert intop.int_mod(sys.maxint, -1) == 0
+        assert intop.int_mod(-sys.maxsize, -1) == 0
+        assert intop.int_mod(sys.maxsize, -1) == 0
 
     def test_int_lshift(self):
         import sys
         from __pypy__ import intop
-        if sys.maxint == 2**31-1:
+        if sys.maxsize == 2**31-1:
             bits = 32
         else:
             bits = 64
         assert intop.int_lshift(42, 3) == 42 << 3
         assert intop.int_lshift(0, 3333) == 0
         assert intop.int_lshift(1, bits-2) == 1 << (bits-2)
-        assert intop.int_lshift(1, bits-1) == -sys.maxint-1 == (-1) << (bits-1)
+        assert intop.int_lshift(1, bits-1) == -sys.maxsize-1 == (-1) << (bits-1)
         assert intop.int_lshift(-1, bits-2) == (-1) << (bits-2)
-        assert intop.int_lshift(-1, bits-1) == -sys.maxint-1
-        assert intop.int_lshift(sys.maxint // 3, 2) == (
-            self.intmask((sys.maxint // 3) << 2))
-        assert intop.int_lshift(-sys.maxint // 3, 2) == (
-            self.intmask((-sys.maxint // 3) << 2))
+        assert intop.int_lshift(-1, bits-1) == -sys.maxsize-1
+        assert intop.int_lshift(sys.maxsize // 3, 2) == (
+            self.intmask((sys.maxsize // 3) << 2))
+        assert intop.int_lshift(-sys.maxsize // 3, 2) == (
+            self.intmask((-sys.maxsize // 3) << 2))
 
     def test_int_rshift(self):
         from __pypy__ import intop
@@ -90,7 +90,7 @@
     def test_uint_rshift(self):
         import sys
         from __pypy__ import intop
-        if sys.maxint == 2**31-1:
+        if sys.maxsize == 2**31-1:
             bits = 32
         else:
             bits = 64
@@ -99,6 +99,6 @@
         assert intop.uint_rshift(-42, 3) == (N-42) >> 3
         assert intop.uint_rshift(0, 3333) == 0
         assert intop.uint_rshift(-1, 0) == -1
-        assert intop.uint_rshift(-1, 1) == sys.maxint
+        assert intop.uint_rshift(-1, 1) == sys.maxsize
         assert intop.uint_rshift(-1, bits-2) == 3
         assert intop.uint_rshift(-1, bits-1) == 1
diff --git a/pypy/module/test_lib_pypy/support.py b/pypy/module/test_lib_pypy/support.py
--- a/pypy/module/test_lib_pypy/support.py
+++ b/pypy/module/test_lib_pypy/support.py
@@ -19,16 +19,15 @@
         return getattr(mod, name)
 
     try:
-        # Assume app-level import finds it from the right place (we
-        # assert so afterwards). It should as long as a builtin module
-        # overshadows it
-        w_mod = space.appexec([], "(): import %s; return %s" % (name, name))
+        # app-level import should find it from the right place (we
+        # assert so afterwards) as long as a builtin module doesn't
+        # overshadow it
+        failed = ("%s didn't import from lib_pypy. Is a usemodules directive "
+                  "overshadowing it?" % name)
+        importline = ("(): import %s; assert 'lib_pypy' in %s.__file__, %r; "
+                      "return %s" % (name, name, failed, name))
+        return space.appexec([], importline)
     except OperationError as e:
         if skipmsg is None or not e.match(space, space.w_ImportError):
             raise
         py.test.skip('%s (%s))' % (skipmsg, str(e)))
-    w_file = space.getattr(w_mod, space.wrap('__file__'))
-    assert space.is_true(space.contains(w_file, space.wrap('lib_pypy'))), \
-        ("%s didn't import from lib_pypy. Is a usemodules directive "
-         "overshadowing it?" % name)
-    return w_mod