[Python-checkins] r83626 - in python/branches/release26-maint: Lib/test/test_compile.py Lib/test/test_complex_args.py Lib/test/test_decimal.py
ezio.melotti
python-checkins at python.org
Tue Aug 3 06:08:59 CEST 2010
Author: ezio.melotti
Date: Tue Aug 3 06:08:59 2010
New Revision: 83626
Log:
Merged revisions 79187-79189 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79187 | florent.xicluna | 2010-03-21 12:50:44 +0200 (Sun, 21 Mar 2010) | 2 lines
Silence more py3k warnings in unittest.case.
........
r79188 | florent.xicluna | 2010-03-21 12:51:40 +0200 (Sun, 21 Mar 2010) | 2 lines
Fix py3k warnings in test_decimal, using unittest.assertItemsEqual.
........
r79189 | florent.xicluna | 2010-03-21 13:03:21 +0200 (Sun, 21 Mar 2010) | 2 lines
Silence some py3k SyntaxWarning using check_py3k_warnings() with "exec" statements.
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Lib/test/test_compile.py
python/branches/release26-maint/Lib/test/test_complex_args.py
python/branches/release26-maint/Lib/test/test_decimal.py
Modified: python/branches/release26-maint/Lib/test/test_compile.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_compile.py (original)
+++ python/branches/release26-maint/Lib/test/test_compile.py Tue Aug 3 06:08:59 2010
@@ -2,6 +2,7 @@
import sys
import _ast
from test import test_support
+import textwrap
class TestSpecifics(unittest.TestCase):
@@ -129,6 +130,9 @@
def test_complex_args(self):
+ with test_support._check_py3k_warnings(
+ ("tuple parameter unpacking has been removed", SyntaxWarning)):
+ exec textwrap.dedent('''
def comp_args((a, b)):
return a,b
self.assertEqual(comp_args((1, 2)), (1, 2))
@@ -146,6 +150,7 @@
return a, b, c
self.assertEqual(comp_args(1, (2, 3)), (1, 2, 3))
self.assertEqual(comp_args(), (2, 3, 4))
+ ''')
def test_argument_order(self):
try:
Modified: python/branches/release26-maint/Lib/test/test_complex_args.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_complex_args.py (original)
+++ python/branches/release26-maint/Lib/test/test_complex_args.py Tue Aug 3 06:08:59 2010
@@ -1,23 +1,30 @@
import unittest
from test import test_support
+import textwrap
class ComplexArgsTestCase(unittest.TestCase):
def check(self, func, expected, *args):
self.assertEqual(func(*args), expected)
- # These functions are tested below as lambdas too. If you add a function test,
- # also add a similar lambda test.
+ # These functions are tested below as lambdas too. If you add a
+ # function test, also add a similar lambda test.
+
+ # Functions are wrapped in "exec" statements in order to
+ # silence Py3k warnings.
def test_func_parens_no_unpacking(self):
+ exec textwrap.dedent("""
def f(((((x))))): return x
self.check(f, 1, 1)
# Inner parens are elided, same as: f(x,)
def f(((x)),): return x
self.check(f, 2, 2)
+ """)
def test_func_1(self):
+ exec textwrap.dedent("""
def f(((((x),)))): return x
self.check(f, 3, (3,))
def f(((((x)),))): return x
@@ -26,16 +33,22 @@
self.check(f, 5, (5,))
def f(((x),)): return x
self.check(f, 6, (6,))
+ """)
def test_func_2(self):
+ exec textwrap.dedent("""
def f(((((x)),),)): return x
self.check(f, 2, ((2,),))
+ """)
def test_func_3(self):
+ exec textwrap.dedent("""
def f((((((x)),),),)): return x
self.check(f, 3, (((3,),),))
+ """)
def test_func_complex(self):
+ exec textwrap.dedent("""
def f((((((x)),),),), a, b, c): return x, a, b, c
self.check(f, (3, 9, 8, 7), (((3,),),), 9, 8, 7)
@@ -44,18 +57,22 @@
def f(a, b, c, ((((((x)),)),),)): return a, b, c, x
self.check(f, (9, 8, 7, 3), 9, 8, 7, (((3,),),))
+ """)
# Duplicate the tests above, but for lambda. If you add a lambda test,
# also add a similar function test above.
def test_lambda_parens_no_unpacking(self):
+ exec textwrap.dedent("""
f = lambda (((((x))))): x
self.check(f, 1, 1)
# Inner parens are elided, same as: f(x,)
f = lambda ((x)),: x
self.check(f, 2, 2)
+ """)
def test_lambda_1(self):
+ exec textwrap.dedent("""
f = lambda (((((x),)))): x
self.check(f, 3, (3,))
f = lambda (((((x)),))): x
@@ -64,16 +81,22 @@
self.check(f, 5, (5,))
f = lambda (((x),)): x
self.check(f, 6, (6,))
+ """)
def test_lambda_2(self):
+ exec textwrap.dedent("""
f = lambda (((((x)),),)): x
self.check(f, 2, ((2,),))
+ """)
def test_lambda_3(self):
+ exec textwrap.dedent("""
f = lambda ((((((x)),),),)): x
self.check(f, 3, (((3,),),))
+ """)
def test_lambda_complex(self):
+ exec textwrap.dedent("""
f = lambda (((((x)),),),), a, b, c: (x, a, b, c)
self.check(f, (3, 9, 8, 7), (((3,),),), 9, 8, 7)
@@ -82,10 +105,14 @@
f = lambda a, b, c, ((((((x)),)),),): (a, b, c, x)
self.check(f, (9, 8, 7, 3), 9, 8, 7, (((3,),),))
+ """)
def test_main():
- test_support.run_unittest(ComplexArgsTestCase)
+ with test_support._check_py3k_warnings(
+ ("tuple parameter unpacking has been removed", SyntaxWarning),
+ ("parenthesized argument names are invalid", SyntaxWarning)):
+ test_support.run_unittest(ComplexArgsTestCase)
if __name__ == "__main__":
test_main()
Modified: python/branches/release26-maint/Lib/test/test_decimal.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_decimal.py (original)
+++ python/branches/release26-maint/Lib/test/test_decimal.py Tue Aug 3 06:08:59 2010
@@ -32,7 +32,7 @@
from decimal import *
import numbers
from test.test_support import (TestSkipped, run_unittest, run_doctest,
- is_resource_enabled)
+ is_resource_enabled, _check_py3k_warnings)
import random
try:
import threading
@@ -219,7 +219,7 @@
if skip_expected:
raise TestSkipped
return
- for line in open(file).xreadlines():
+ for line in open(file):
line = line.replace('\r\n', '').replace('\n', '')
#print line
try:
@@ -381,8 +381,9 @@
myexceptions = self.getexceptions()
self.context.clear_flags()
- myexceptions.sort()
- theirexceptions.sort()
+ with _check_py3k_warnings(quiet=True):
+ myexceptions.sort()
+ theirexceptions.sort()
self.assertEqual(result, ans,
'Incorrect answer for ' + s + ' -- got ' + result)
@@ -637,12 +638,13 @@
('//', '__floordiv__', '__rfloordiv__'),
('**', '__pow__', '__rpow__')
]
- if 1/2 == 0:
- # testing with classic division, so add __div__
- oplist.append(('/', '__div__', '__rdiv__'))
- else:
- # testing with -Qnew, so add __truediv__
- oplist.append(('/', '__truediv__', '__rtruediv__'))
+ with _check_py3k_warnings():
+ if 1 / 2 == 0:
+ # testing with classic division, so add __div__
+ oplist.append(('/', '__div__', '__rdiv__'))
+ else:
+ # testing with -Qnew, so add __truediv__
+ oplist.append(('/', '__truediv__', '__rtruediv__'))
for sym, lop, rop in oplist:
setattr(E, lop, lambda self, other: 'str' + lop + str(other))
@@ -1095,8 +1097,9 @@
self.assertEqual(a, b)
# with None
- self.assertFalse(Decimal(1) < None)
- self.assertTrue(Decimal(1) > None)
+ with _check_py3k_warnings():
+ self.assertFalse(Decimal(1) < None)
+ self.assertTrue(Decimal(1) > None)
def test_copy_and_deepcopy_methods(self):
d = Decimal('43.24')
@@ -1556,18 +1559,20 @@
for flag in extra_flags:
if flag not in expected_flags:
expected_flags.append(flag)
- expected_flags.sort()
+ with _check_py3k_warnings(quiet=True):
+ expected_flags.sort()
# flags we actually got
new_flags = [k for k,v in context.flags.items() if v]
- new_flags.sort()
+ with _check_py3k_warnings(quiet=True):
+ new_flags.sort()
self.assertEqual(ans, new_ans,
"operation produces different answers depending on flags set: " +
"expected %s, got %s." % (ans, new_ans))
self.assertEqual(new_flags, expected_flags,
- "operation raises different flags depending on flags set: " +
- "expected %s, got %s" % (expected_flags, new_flags))
+ "operation raises different flags depending on flags set: " +
+ "expected %s, got %s" % (expected_flags, new_flags))
def test_main(arith=False, verbose=None, todo_tests=None, debug=None):
""" Execute the tests.
More information about the Python-checkins
mailing list