Author: Benjamin Peterson <benja...@python.org>
Branch: py3k
Changeset: r53350:ee9367a8681e
Date: 2012-03-12 14:03 -0700
http://bitbucket.org/pypy/pypy/changeset/ee9367a8681e/
Log: merge heads
diff --git a/pypy/module/mmap/test/test_mmap.py
b/pypy/module/mmap/test/test_mmap.py
--- a/pypy/module/mmap/test/test_mmap.py
+++ b/pypy/module/mmap/test/test_mmap.py
@@ -596,7 +596,7 @@
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)
@@ -618,7 +618,7 @@
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)
diff --git a/pypy/module/operator/app_operator.py
b/pypy/module/operator/app_operator.py
--- a/pypy/module/operator/app_operator.py
+++ b/pypy/module/operator/app_operator.py
@@ -39,7 +39,7 @@
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")
diff --git a/pypy/module/operator/test/test_operator.py
b/pypy/module/operator/test/test_operator.py
--- a/pypy/module/operator/test/test_operator.py
+++ b/pypy/module/operator/test/test_operator.py
@@ -145,7 +145,7 @@
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
diff --git a/pypy/module/rctime/test/test_rctime.py
b/pypy/module/rctime/test/test_rctime.py
--- a/pypy/module/rctime/test/test_rctime.py
+++ b/pypy/module/rctime/test/test_rctime.py
@@ -104,8 +104,8 @@
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)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
