summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorMichael Foord <fuzzyman@voidspace.org.uk>2010-03-07 23:10:36 (GMT)
committerMichael Foord <fuzzyman@voidspace.org.uk>2010-03-07 23:10:36 (GMT)
commita715255a27571d06eb9811221e69f6511f62bde7 (patch)
tree7ae4b409f4833dccb6a641ef75f2e36fd7c5fa59 /Lib
parent5ffa325a82b89a7b79d779b32a4d9ad2ad91aadd (diff)
downloadcpython-a715255a27571d06eb9811221e69f6511f62bde7.zip
cpython-a715255a27571d06eb9811221e69f6511f62bde7.tar.gz
cpython-a715255a27571d06eb9811221e69f6511f62bde7.tar.bz2
Fix accidental name rebinding in unittest py3k warning filtering.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/unittest/case.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index 0bfcc75..f5dc87b 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -798,10 +798,10 @@ class TestCase(object):
with warnings.catch_warnings():
if sys.py3kwarning:
# Silence Py3k warning raised during the sorting
- for msg in ["dict inequality comparisons",
+ for _msg in ["dict inequality comparisons",
"builtin_function_or_method order comparisons",
"comparing unequal types"]:
- warnings.filterwarnings("ignore", msg, DeprecationWarning)
+ warnings.filterwarnings("ignore", _msg, DeprecationWarning)
try:
expected = set(expected_seq)
actual = set(actual_seq)
@@ -820,6 +820,7 @@ class TestCase(object):
if unexpected:
errors.append('Unexpected, but present:\n %s' %
safe_repr(unexpected))
+ print 'errors', errors
if errors:
standardMsg = '\n'.join(errors)
self.fail(self._formatMessage(msg, standardMsg))