Merged revisions 79165 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79165 | florent.xicluna | 2010-03-21 03:14:24 +0200 (Sun, 21 Mar 2010) | 2 lines
#7092 - Silence more py3k deprecation warnings, using test_support.check_py3k_warnings() helper.
........
diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py
index 9be8f79..dc9765f 100644
--- a/Lib/test/test_inspect.py
+++ b/Lib/test/test_inspect.py
@@ -4,10 +4,13 @@
import inspect
import datetime
-from test.test_support import TESTFN, run_unittest
+from test.test_support import run_unittest, _check_py3k_warnings
-from test import inspect_fodder as mod
-from test import inspect_fodder2 as mod2
+with _check_py3k_warnings(
+ ("tuple parameter unpacking has been removed", SyntaxWarning),
+ quiet=True):
+ from test import inspect_fodder as mod
+ from test import inspect_fodder2 as mod2
# Functions tested in this suite:
# ismodule, isclass, ismethod, isfunction, istraceback, isframe, iscode,
@@ -26,7 +29,7 @@
import __builtin__
try:
- 1/0
+ 1 // 0
except:
tb = sys.exc_traceback
@@ -361,11 +364,14 @@
self.assertArgSpecEquals(A.m, ['self'])
def test_getargspec_sublistofone(self):
- def sublistOfOne((foo,)): return 1
- self.assertArgSpecEquals(sublistOfOne, [['foo']])
+ with _check_py3k_warnings(
+ ("tuple parameter unpacking has been removed", SyntaxWarning),
+ ("parenthesized argument names are invalid", SyntaxWarning)):
+ exec 'def sublistOfOne((foo,)): return 1'
+ self.assertArgSpecEquals(sublistOfOne, [['foo']])
- def fakeSublistOfOne((foo)): return 1
- self.assertArgSpecEquals(fakeSublistOfOne, ['foo'])
+ exec 'def fakeSublistOfOne((foo)): return 1'
+ self.assertArgSpecEquals(fakeSublistOfOne, ['foo'])
def test_classify_oldstyle(self):
class A: