summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2010-03-21 10:50:44 (GMT)
committerFlorent Xicluna <florent.xicluna@gmail.com>2010-03-21 10:50:44 (GMT)
commit4a0f8b89f6adde81971b39a4302dc38dbbd42101 (patch)
treecab0c903b10745b7d602b016d359844195c47d2f /Lib
parent236da4be4e0455440b427bde19d858a812546859 (diff)
downloadcpython-4a0f8b89f6adde81971b39a4302dc38dbbd42101.zip
cpython-4a0f8b89f6adde81971b39a4302dc38dbbd42101.tar.gz
cpython-4a0f8b89f6adde81971b39a4302dc38dbbd42101.tar.bz2
Silence more py3k warnings in unittest.case.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/unittest/case.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
index 2af48e1..feae3fa 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)