summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-02-02 15:12:42 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2010-02-02 15:12:42 (GMT)
commit0ac4d4c82df9c2d629dee9cd388e84b7f08d25fe (patch)
treed5347275643237d1e05c28afb22f980f53b5e284
parent5d62cfe070b63cdb3c80744ef9970facc008750c (diff)
downloadcpython-0ac4d4c82df9c2d629dee9cd388e84b7f08d25fe.zip
cpython-0ac4d4c82df9c2d629dee9cd388e84b7f08d25fe.tar.gz
cpython-0ac4d4c82df9c2d629dee9cd388e84b7f08d25fe.tar.bz2
Silence a couple of -3 warnings
-rw-r--r--Lib/test/test_unittest.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py
index a0f40f8..f24117c 100644
--- a/Lib/test/test_unittest.py
+++ b/Lib/test/test_unittest.py
@@ -3056,7 +3056,7 @@ class Test_Assertions(TestCase):
try:
self.assertRaises(KeyError, lambda: None)
except self.failureException as e:
- self.assertIn("KeyError not raised", e)
+ self.assertIn("KeyError not raised", e.args)
else:
self.fail("assertRaises() didn't fail")
try:
@@ -3073,7 +3073,7 @@ class Test_Assertions(TestCase):
with self.assertRaises(KeyError):
pass
except self.failureException as e:
- self.assertIn("KeyError not raised", e)
+ self.assertIn("KeyError not raised", e.args)
else:
self.fail("assertRaises() didn't fail")
try:
@@ -3591,6 +3591,9 @@ class TestDiscovery(TestCase):
def __eq__(self, other):
return self.path == other.path
+ # Silence py3k warning
+ __hash__ = None
+
loader._get_module_from_name = lambda name: Module(name)
def loadTestsFromModule(module, use_load_tests):
if use_load_tests: