From: Chris Withers Date: Wed, 1 May 2019 07:48:44 +0000 (+0100) Subject: remove jython support from unittest.mock (GH#13033) X-Git-Tag: v3.8.0a4~50 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49e27f0afb02ce7b98ed5a4387238850117f4c7e;p=python remove jython support from unittest.mock (GH#13033) --- diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py index 997af71725..721e91f8cb 100644 --- a/Lib/unittest/mock.py +++ b/Lib/unittest/mock.py @@ -36,13 +36,6 @@ from functools import wraps, partial _builtins = {name for name in dir(builtins) if not name.startswith('_')} -BaseExceptions = (BaseException,) -if 'java' in sys.platform: - # jython - import java - BaseExceptions = (BaseException, java.lang.Throwable) - - FILTER_DIR = True # Workaround for issue #12370 @@ -57,8 +50,8 @@ def _is_instance_mock(obj): def _is_exception(obj): return ( - isinstance(obj, BaseExceptions) or - isinstance(obj, type) and issubclass(obj, BaseExceptions) + isinstance(obj, BaseException) or + isinstance(obj, type) and issubclass(obj, BaseException) ) diff --git a/Lib/unittest/test/testmock/testmock.py b/Lib/unittest/test/testmock/testmock.py index 0e7e4a1d8c..9bef51abd8 100644 --- a/Lib/unittest/test/testmock/testmock.py +++ b/Lib/unittest/test/testmock/testmock.py @@ -184,21 +184,6 @@ class MockTest(unittest.TestCase): mock.side_effect = ValueError('Bazinga!') self.assertRaisesRegex(ValueError, 'Bazinga!', mock) - @unittest.skipUnless('java' in sys.platform, - 'This test only applies to Jython') - def test_java_exception_side_effect(self): - import java - mock = Mock(side_effect=java.lang.RuntimeException("Boom!")) - - # can't use assertRaises with java exceptions - try: - mock(1, 2, fish=3) - except java.lang.RuntimeException: - pass - else: - self.fail('java exception not raised') - mock.assert_called_with(1,2, fish=3) - def test_reset_mock(self): parent = Mock() diff --git a/Lib/unittest/test/testmock/testpatch.py b/Lib/unittest/test/testmock/testpatch.py index 51c66fec67..e5abd9bda4 100644 --- a/Lib/unittest/test/testmock/testpatch.py +++ b/Lib/unittest/test/testmock/testpatch.py @@ -1312,7 +1312,6 @@ class PatchTest(unittest.TestCase): def test_patch_multiple_create_mocks_different_order(self): - # bug revealed by Jython! original_f = Foo.f original_g = Foo.g