diff options
| author | Chris Withers <chris@withers.org> | 2019-05-01 07:48:44 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-01 07:48:44 (GMT) |
| commit | 49e27f0afb02ce7b98ed5a4387238850117f4c7e (patch) | |
| tree | 5c953e3687fba50067acbd99b73fbda55e113ea4 /Lib/unittest/mock.py | |
| parent | db7197543112954b0912e3d46e39fefcb1c3b950 (diff) | |
| download | cpython-49e27f0afb02ce7b98ed5a4387238850117f4c7e.zip cpython-49e27f0afb02ce7b98ed5a4387238850117f4c7e.tar.gz cpython-49e27f0afb02ce7b98ed5a4387238850117f4c7e.tar.bz2 | |
remove jython support from unittest.mock (GH#13033)
Diffstat (limited to 'Lib/unittest/mock.py')
| -rw-r--r-- | Lib/unittest/mock.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Lib/unittest/mock.py b/Lib/unittest/mock.py index 997af71..721e91f 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) ) |