traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix accidental name rebinding in unittest py3k warning filtering.

This commit is contained in:
Michael Foord 2010-03-07 23:10:36 +00:00
parent 5ffa325a82
commit a715255a27
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/unittest/case.py
View File

@ -798,10 +798,10 @@ class TestCase(object):
with warnings.catch_warnings(): with warnings.catch_warnings():
if sys.py3kwarning: if sys.py3kwarning:
# Silence Py3k warning raised during the sorting # 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", "builtin_function_or_method order comparisons",
"comparing unequal types"]: "comparing unequal types"]:
warnings.filterwarnings("ignore", msg, DeprecationWarning) warnings.filterwarnings("ignore", _msg, DeprecationWarning)
try: try:
expected = set(expected_seq) expected = set(expected_seq)
actual = set(actual_seq) actual = set(actual_seq)
@ -820,6 +820,7 @@ class TestCase(object):
if unexpected: if unexpected:
errors.append('Unexpected, but present:\n %s' % errors.append('Unexpected, but present:\n %s' %
safe_repr(unexpected)) safe_repr(unexpected))
print 'errors', errors
if errors: if errors:
standardMsg = '\n'.join(errors) standardMsg = '\n'.join(errors)
self.fail(self._formatMessage(msg, standardMsg)) self.fail(self._formatMessage(msg, standardMsg))