diff options
| author | Senthil Kumaran <orsenthil@gmail.com> | 2010-01-08 19:04:16 +0000 |
|---|---|---|
| committer | Senthil Kumaran <orsenthil@gmail.com> | 2010-01-08 19:04:16 +0000 |
| commit | ce8e33a095030e7af94f58f9da196b240bdf0476 (patch) | |
| tree | b0ba50cbb6e85c6be6f6e6a870e4232be50a0f9c /Lib/test/test_unittest.py | |
| parent | 3ddc435af6873c6304058d7bcbcb19ee4fba7781 (diff) | |
| download | cpython-git-ce8e33a095030e7af94f58f9da196b240bdf0476.tar.gz | |
Reverting the Revision: 77368. I committed Flox's big patch for tests by
mistake. ( It may come in for sure tough)
Diffstat (limited to 'Lib/test/test_unittest.py')
| -rw-r--r-- | Lib/test/test_unittest.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py index 9b24c8c153..db51f77d7b 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.assert_("KeyError not raised" in e.args, str(e)) + self.assert_("KeyError not raised" in e, str(e)) 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.assert_("KeyError not raised" in e.args, str(e)) + self.assert_("KeyError not raised" in e, str(e)) else: self.fail("assertRaises() didn't fail") try: @@ -3591,9 +3591,6 @@ 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: |