Author: Amaury Forgeot d'Arc <[email protected]>
Branch: py3k
Changeset: r51637:52eaf273d8ed
Date: 2012-01-21 22:36 +0100
http://bitbucket.org/pypy/pypy/changeset/52eaf273d8ed/
Log: Easy fixes in test_compiler
diff --git a/pypy/interpreter/astcompiler/test/test_compiler.py
b/pypy/interpreter/astcompiler/test/test_compiler.py
--- a/pypy/interpreter/astcompiler/test/test_compiler.py
+++ b/pypy/interpreter/astcompiler/test/test_compiler.py
@@ -226,8 +226,7 @@
def test_funccalls(self):
decl = py.code.Source("""
def f(*args, **kwds):
- kwds = kwds.items()
- kwds.sort()
+ kwds = sorted(kwds.items())
return list(args) + kwds
""")
decl = str(decl) + '\n'
@@ -328,7 +327,7 @@
from __foo__.bar import x
try:
A().m()
- except ImportError, e:
+ except ImportError as e:
msg = str(e)
''', "msg", "No module named __foo__")
@@ -519,8 +518,8 @@
""", 'x', [True, 3, 4, 6]
def test_type_of_constants(self):
- yield self.simple_test, "x=[0, 0L]", 'type(x[1])', long
- yield self.simple_test, "x=[(1,0), (1,0L)]", 'type(x[1][1])', long
+ yield self.simple_test, "x=[0, 0.]", 'type(x[1])', float
+ yield self.simple_test, "x=[(1,0), (1,0.)]", 'type(x[1][1])', float
yield self.simple_test, "x=['2?-', '2?-']", 'id(x[0])==id(x[1])', True
def test_pprint(self):
@@ -646,17 +645,15 @@
#Indexing
for key, value in self.reference.items():
self.assertEqual(d[key], value)
- knownkey = self.other.keys()[0]
+ knownkey = next(iter(self.other))
self.failUnlessRaises(KeyError, lambda:d[knownkey])
#len
self.assertEqual(len(p), 0)
self.assertEqual(len(d), len(self.reference))
#has_key
for k in self.reference:
- self.assert_(d.has_key(k))
self.assert_(k in d)
for k in self.other:
- self.failIf(d.has_key(k))
self.failIf(k in d)
#cmp
self.assertEqual(cmp(p,p), 0)
diff --git a/pypy/interpreter/pyparser/test/expressions.py
b/pypy/interpreter/pyparser/test/expressions.py
--- a/pypy/interpreter/pyparser/test/expressions.py
+++ b/pypy/interpreter/pyparser/test/expressions.py
@@ -4,11 +4,11 @@
constants = [
"0",
+ "00",
"7",
"-3",
- "053",
+ "0o53",
"0x18",
- "14L",
"1.0",
"3.9",
"-3.6",
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
