Merged revisions 86596 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r86596 | ezio.melotti | 2010-11-20 21:04:17 +0200 (Sat, 20 Nov 2010) | 1 line
#9424: Replace deprecated assert* methods in the Python test suite.
........
diff --git a/Lib/test/test_compiler.py b/Lib/test/test_compiler.py
index e36a355..332e0bb 100644
--- a/Lib/test/test_compiler.py
+++ b/Lib/test/test_compiler.py
@@ -81,8 +81,8 @@
"<string>", "exec")
dct = {}
exec c in dct
- self.assertEquals(dct.get('e'), 1)
- self.assertEquals(dct.get('f'), 1)
+ self.assertEqual(dct.get('e'), 1)
+ self.assertEqual(dct.get('f'), 1)
def testDefaultArgs(self):
self.assertRaises(SyntaxError, compiler.parse, "def foo(a=1, b): pass")
@@ -93,7 +93,7 @@
c = compiler.compile('def f():\n "doc"', '<string>', 'exec')
g = {}
exec c in g
- self.assertEquals(g['f'].__doc__, "doc")
+ self.assertEqual(g['f'].__doc__, "doc")
def testLineNo(self):
# Test that all nodes except Module have a correct lineno attribute.
@@ -120,8 +120,8 @@
self.check_lineno(child)
def testFlatten(self):
- self.assertEquals(flatten([1, [2]]), [1, 2])
- self.assertEquals(flatten((1, (2,))), [1, 2])
+ self.assertEqual(flatten([1, [2]]), [1, 2])
+ self.assertEqual(flatten((1, (2,))), [1, 2])
def testNestedScope(self):
c = compiler.compile('def g():\n'
@@ -133,44 +133,44 @@
'exec')
dct = {}
exec c in dct
- self.assertEquals(dct.get('result'), 3)
+ self.assertEqual(dct.get('result'), 3)
def testGenExp(self):
c = compiler.compile('list((i,j) for i in range(3) if i < 3'
' for j in range(4) if j > 2)',
'<string>',
'eval')
- self.assertEquals(eval(c), [(0, 3), (1, 3), (2, 3)])
+ self.assertEqual(eval(c), [(0, 3), (1, 3), (2, 3)])
def testSetLiteral(self):
c = compiler.compile('{1, 2, 3}', '<string>', 'eval')
- self.assertEquals(eval(c), {1,2,3})
+ self.assertEqual(eval(c), {1,2,3})
c = compiler.compile('{1, 2, 3,}', '<string>', 'eval')
- self.assertEquals(eval(c), {1,2,3})
+ self.assertEqual(eval(c), {1,2,3})
def testDictLiteral(self):
c = compiler.compile('{1:2, 2:3, 3:4}', '<string>', 'eval')
- self.assertEquals(eval(c), {1:2, 2:3, 3:4})
+ self.assertEqual(eval(c), {1:2, 2:3, 3:4})
c = compiler.compile('{1:2, 2:3, 3:4,}', '<string>', 'eval')
- self.assertEquals(eval(c), {1:2, 2:3, 3:4})
+ self.assertEqual(eval(c), {1:2, 2:3, 3:4})
def testSetComp(self):
c = compiler.compile('{x for x in range(1, 4)}', '<string>', 'eval')
- self.assertEquals(eval(c), {1, 2, 3})
+ self.assertEqual(eval(c), {1, 2, 3})
c = compiler.compile('{x * y for x in range(3) if x != 0'
' for y in range(4) if y != 0}',
'<string>',
'eval')
- self.assertEquals(eval(c), {1, 2, 3, 4, 6})
+ self.assertEqual(eval(c), {1, 2, 3, 4, 6})
def testDictComp(self):
c = compiler.compile('{x:x+1 for x in range(1, 4)}', '<string>', 'eval')
- self.assertEquals(eval(c), {1:2, 2:3, 3:4})
+ self.assertEqual(eval(c), {1:2, 2:3, 3:4})
c = compiler.compile('{(x, y) : y for x in range(2) if x != 0'
' for y in range(3) if y != 0}',
'<string>',
'eval')
- self.assertEquals(eval(c), {(1, 2): 2, (1, 1): 1})
+ self.assertEqual(eval(c), {(1, 2): 2, (1, 1): 1})
def testWith(self):
# SF bug 1638243
@@ -183,7 +183,7 @@
'exec' )
dct = {'TrivialContext': TrivialContext}
exec c in dct
- self.assertEquals(dct.get('result'), 1)
+ self.assertEqual(dct.get('result'), 1)
def testWithAss(self):
c = compiler.compile('from __future__ import with_statement\n'
@@ -195,7 +195,7 @@
'exec' )
dct = {'TrivialContext': TrivialContext}
exec c in dct
- self.assertEquals(dct.get('result'), 1)
+ self.assertEqual(dct.get('result'), 1)
def testWithMult(self):
events = []
@@ -215,8 +215,8 @@
'exec' )
dct = {'Ctx': Ctx}
exec c in dct
- self.assertEquals(dct.get('result'), 1)
- self.assertEquals(events, [1, 2])
+ self.assertEqual(dct.get('result'), 1)
+ self.assertEqual(events, [1, 2])
def testGlobal(self):
code = compiler.compile('global x\nx=1', '<string>', 'exec')
@@ -224,7 +224,7 @@
d2 = {}
exec code in d1, d2
# x should be in the globals dict
- self.assertEquals(d1.get('x'), 1)
+ self.assertEqual(d1.get('x'), 1)
def testPrintFunction(self):
c = compiler.compile('from __future__ import print_function\n'
@@ -234,14 +234,14 @@
'exec' )
dct = {'output': StringIO()}
exec c in dct
- self.assertEquals(dct['output'].getvalue(), 'a**b++')
+ self.assertEqual(dct['output'].getvalue(), 'a**b++')
def _testErrEnc(self, src, text, offset):
try:
compile(src, "", "exec")
except SyntaxError, e:
- self.assertEquals(e.offset, offset)
- self.assertEquals(e.text, text)
+ self.assertEqual(e.offset, offset)
+ self.assertEqual(e.text, text)
def testSourceCodeEncodingsError(self):
# Test SyntaxError with encoding definition