Commits

Benjamin Peterson committed ee9367a Merge

merge heads

Comments (0)

Files changed (4)

pypy/module/mmap/test/test_mmap.py

         import sys
         size = 0x14FFFFFFF
         if sys.platform.startswith('win') or sys.platform == 'darwin':
-            self.skip('test requires %s bytes and a long time to run' % size)
+            skip('test requires %s bytes and a long time to run' % size)
 
         with open(self.tmpname, "w+b") as f:
             f.seek(size)
         import sys
         size = 0x17FFFFFFF
         if sys.platform.startswith('win') or sys.platform == 'darwin':
-            self.skip('test requires %s bytes and a long time to run' % size)
+            skip('test requires %s bytes and a long time to run' % size)
 
         with open(self.tmpname, "w+b") as f:
             f.seek(size)

pypy/module/operator/app_operator.py

 
 def repeat(obj, num):
     'repeat(a, b) -- Return a * b, where a is a sequence, and b is an integer.'
-    if not isinstance(num, (int, long)):
+    if not isinstance(num, int):
         raise TypeError('an integer is required')
     if not isSequenceType(obj):
         raise TypeError("non-sequence object can't be repeated")

pypy/module/operator/test/test_operator.py

         raises(TypeError, operator.isSequenceType)
         assert operator.isSequenceType(dir())
         assert operator.isSequenceType(())
-        assert operator.isSequenceType(xrange(10))
+        assert operator.isSequenceType(range(10))
         assert operator.isSequenceType('yeahbuddy')
         assert not operator.isSequenceType(3)
         class Dict(dict): pass

pypy/module/rctime/test/test_rctime.py

         raises(ValueError, rctime.mktime, tuple(ltime))
 
         t = rctime.time()
-        assert long(rctime.mktime(rctime.localtime(t))) == long(t)
-        assert long(rctime.mktime(rctime.gmtime(t))) - rctime.timezone == long(t)
+        assert int(rctime.mktime(rctime.localtime(t))) == int(t)
+        assert int(rctime.mktime(rctime.gmtime(t))) - rctime.timezone == int(t)
         ltime = rctime.localtime()
         assert rctime.mktime(tuple(ltime)) == rctime.mktime(ltime)