diff options
| author | Nikita Sobolev <mail@sobolevn.me> | 2022-12-23 20:17:24 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-23 20:17:24 (GMT) |
| commit | 745545b5bb847023f90505bf9caa983463413780 (patch) | |
| tree | 1b6db7fc6c92542ac9bc56769524ee26ce9eb10e /Lib/test/support | |
| parent | c5726b727e26b81a267933654cf26b760a90d9aa (diff) | |
| download | cpython-745545b5bb847023f90505bf9caa983463413780.zip cpython-745545b5bb847023f90505bf9caa983463413780.tar.gz cpython-745545b5bb847023f90505bf9caa983463413780.tar.bz2 | |
gh-99482: remove `jython` compatibility parts from stdlib and tests (#99484)
Diffstat (limited to 'Lib/test/support')
| -rw-r--r-- | Lib/test/support/__init__.py | 3 | ||||
| -rw-r--r-- | Lib/test/support/os_helper.py | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index b718605..ff736f1 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -505,6 +505,7 @@ def requires_debug_ranges(reason='requires co_positions / debug_ranges'): requires_legacy_unicode_capi = unittest.skipUnless(unicode_legacy_string, 'requires legacy Unicode C API') +# Is not actually used in tests, but is kept for compatibility. is_jython = sys.platform.startswith('java') is_android = hasattr(sys, 'getandroidapilevel') @@ -736,8 +737,6 @@ def gc_collect(): """ import gc gc.collect() - if is_jython: - time.sleep(0.1) gc.collect() gc.collect() diff --git a/Lib/test/support/os_helper.py b/Lib/test/support/os_helper.py index f37a442..2d4356a 100644 --- a/Lib/test/support/os_helper.py +++ b/Lib/test/support/os_helper.py @@ -11,11 +11,7 @@ import warnings # Filename used for testing -if os.name == 'java': - # Jython disallows @ in module names - TESTFN_ASCII = '$test' -else: - TESTFN_ASCII = '@test' +TESTFN_ASCII = '@test' # Disambiguate TESTFN for parallel testing, while letting it remain a valid # module name. |