From: Florent Xicluna <florent.xicluna@gmail.com>
Date: Sun, 21 Mar 2010 10:50:44 +0000 (+0000)
Subject: Silence more py3k warnings in unittest.case.
X-Git-Tag: v2.7b1~287
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a0f8b89f6adde81971b39a4302dc38dbbd42101;p=python

Silence more py3k warnings in unittest.case.
---

diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index 2af48e1fb4..feae3fa7a6 100644
--- a/Lib/unittest/case.py
+++ b/Lib/unittest/case.py
@@ -568,7 +568,7 @@ class TestCase(object):
             msg: Optional message to use on failure instead of a list of
                     differences.
         """
-        if seq_type != None:
+        if seq_type is not None:
             seq_type_name = seq_type.__name__
             if not isinstance(seq1, seq_type):
                 raise self.failureException('First sequence is not a %s: %s'
@@ -802,7 +802,7 @@ 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 ["(code|dict|type) inequality comparisons",
                              "builtin_function_or_method order comparisons",
                              "comparing unequal types"]:
                     warnings.filterwarnings("ignore", _msg, DeprecationWarning)