From: Michael Foord <fuzzyman@voidspace.org.uk>
Date: Sun, 7 Mar 2010 23:10:36 +0000 (+0000)
Subject: Fix accidental name rebinding in unittest py3k warning filtering.
X-Git-Tag: v2.7b1~423
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a715255a27571d06eb9811221e69f6511f62bde7;p=python

Fix accidental name rebinding in unittest py3k warning filtering.
---

diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index 0bfcc757ac..f5dc87baf4 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))