[pypy-commit] pypy win64-stage1: bad bad

[ctismer]

Author: Christian Tismer <tismer at stackless.com>
Branch: win64-stage1
Changeset: r49639:ba80ac53c5fb
Date: 2011-11-21 18:32 +0100
http://bitbucket.org/pypy/pypy/changeset/ba80ac53c5fb/

Log:	bad bad

diff --git a/lib_pypy/pyexpat.py b/lib_pypy/pyexpat.py
--- a/lib_pypy/pyexpat.py
+++ b/lib_pypy/pyexpat.py
@@ -371,7 +371,7 @@
                 self._flush_character_buffer()
                 self.buffer = None
         elif name == 'buffer_size':
-            if not isinstance(value, (int, long)):
+            if not isinstance(value, int):
                 raise TypeError("Expected int")
             if value <= 0:
                 raise ValueError("Expected positive int")
diff --git a/pypy/jit/metainterp/history.py b/pypy/jit/metainterp/history.py
--- a/pypy/jit/metainterp/history.py
+++ b/pypy/jit/metainterp/history.py
@@ -268,7 +268,7 @@
 
     def __init__(self, value):
         if not we_are_translated():
-            if isinstance(value, (int, long)):
+            if isinstance(value, int):
                 value = int(value)    # bool -> int
             else:
                 assert isinstance(value, Symbolic)
@@ -515,7 +515,7 @@
 
     def __init__(self, value=0):
         if not we_are_translated():
-            if isinstance(value, (int, long)):
+            if isinstance(value, int):
                 value = int(value)    # bool -> int
             else:
                 assert isinstance(value, Symbolic)
diff --git a/pypy/jit/metainterp/optimizeopt/vstring.py b/pypy/jit/metainterp/optimizeopt/vstring.py
--- a/pypy/jit/metainterp/optimizeopt/vstring.py
+++ b/pypy/jit/metainterp/optimizeopt/vstring.py
@@ -713,7 +713,7 @@
     for name in dir(OptString):
         if name.startswith(prefix):
             value = getattr(EffectInfo, 'OS_' + name[len(prefix):])
-            assert isinstance(value, (int, long)) and value != 0
+            assert isinstance(value, int) and value != 0
             result.append((value, getattr(OptString, name)))
     return unrolling_iterable(result)
 opt_call_oopspec_ops = _findall_call_oopspec()
diff --git a/pypy/module/mmap/__init__.py b/pypy/module/mmap/__init__.py
--- a/pypy/module/mmap/__init__.py
+++ b/pypy/module/mmap/__init__.py
@@ -18,7 +18,7 @@
     def buildloaders(cls):
         from pypy.module.mmap import interp_mmap
         for constant, value in rmmap.constants.iteritems():
-            if isinstance(value, (int, long)):
+            if isinstance(value, int):
                 Module.interpleveldefs[constant] = "space.wrap(%r)" % value
         
         super(Module, cls).buildloaders()
diff --git a/pypy/module/signal/interp_signal.py b/pypy/module/signal/interp_signal.py
--- a/pypy/module/signal/interp_signal.py
+++ b/pypy/module/signal/interp_signal.py
@@ -15,7 +15,7 @@
 
 def setup():
     for key, value in cpy_signal.__dict__.items():
-        if key.startswith('SIG') and isinstance(value, (int, long)):
+        if key.startswith('SIG') and isinstance(value, int):
             globals()[key] = value
             yield key
 
diff --git a/pypy/objspace/std/test/test_listobject.py b/pypy/objspace/std/test/test_listobject.py
--- a/pypy/objspace/std/test/test_listobject.py
+++ b/pypy/objspace/std/test/test_listobject.py
@@ -191,7 +191,7 @@
                 self.space.raises_w(self.space.w_IndexError,
                                     self.space.setitem, w_list, w(key), w(42))
             else:
-                if isinstance(value, (int, long)):   # non-slicing
+                if isinstance(value, int):   # non-slicing
                     if random.random() < 0.25:   # deleting
                         self.space.delitem(w_list, w(key))
                         del expected[key]
diff --git a/pypy/rlib/clibffi.py b/pypy/rlib/clibffi.py
--- a/pypy/rlib/clibffi.py
+++ b/pypy/rlib/clibffi.py
@@ -309,7 +309,7 @@
 FFI_OK = cConfig.FFI_OK
 FFI_BAD_TYPEDEF = cConfig.FFI_BAD_TYPEDEF
 FFI_DEFAULT_ABI = cConfig.FFI_DEFAULT_ABI
-if _WIN32 and not _WIN64:
+if _WIN32:
     FFI_STDCALL = cConfig.FFI_STDCALL
 FFI_TYPE_STRUCT = cConfig.FFI_TYPE_STRUCT
 FFI_CIFP = rffi.COpaquePtr('ffi_cif', compilation_info=eci)
diff --git a/pypy/rpython/module/test/test_posix.py b/pypy/rpython/module/test/test_posix.py
--- a/pypy/rpython/module/test/test_posix.py
+++ b/pypy/rpython/module/test/test_posix.py
@@ -61,7 +61,7 @@
         assert isinstance(times, tuple)
         assert len(times) == 5
         for value in times:
-            assert isinstance(value, (int, long))
+            assert isinstance(value, int)
 
 
     def test_lseek(self):