diff --git a/IPython/terminal/shortcuts.py b/IPython/terminal/shortcuts.py index 26e1883..029adc9 100644 --- a/IPython/terminal/shortcuts.py +++ b/IPython/terminal/shortcuts.py @@ -163,10 +163,9 @@ def create_ipython_shortcuts(shell): kb.add(*keys, filter=focused_insert & ebivim)(cmd) def get_input_mode(self): - if sys.version_info[0] == 3: - app = get_app() - app.ttimeoutlen = shell.ttimeoutlen - app.timeoutlen = shell.timeoutlen + app = get_app() + app.ttimeoutlen = shell.ttimeoutlen + app.timeoutlen = shell.timeoutlen return self._input_mode diff --git a/IPython/testing/decorators.py b/IPython/testing/decorators.py index a797c1c..d2f325b 100644 --- a/IPython/testing/decorators.py +++ b/IPython/testing/decorators.py @@ -162,11 +162,6 @@ _x11_skip_msg = "Skipped under *nix when X11/XOrg not available" skip_if_no_x11 = skipif(_x11_skip_cond, _x11_skip_msg) - -# Decorators to skip certain tests on specific platform/python combinations -skip_win32_py38 = skipif(sys.version_info > (3,8) and os.name == 'nt') - - # Other skip decorators # generic skip without module diff --git a/IPython/testing/tools.py b/IPython/testing/tools.py index 3dec1ff..31bfd42 100644 --- a/IPython/testing/tools.py +++ b/IPython/testing/tools.py @@ -191,9 +191,6 @@ def ipexec(fname, options=None, commands=()): # Absolute path for filename full_fname = os.path.join(test_dir, fname) full_cmd = ipython_cmd + cmdargs + ['--', full_fname] - if sys.platform == "win32" and sys.version_info < (3, 8): - # subprocess.Popen does not support Path objects yet - full_cmd = list(map(str, full_cmd)) env = os.environ.copy() # FIXME: ignore all warnings in ipexec while we have shims # should we keep suppressing warnings here, even after removing shims? diff --git a/IPython/utils/tests/test_path.py b/IPython/utils/tests/test_path.py index 3faf91d..6f29150 100644 --- a/IPython/utils/tests/test_path.py +++ b/IPython/utils/tests/test_path.py @@ -19,9 +19,11 @@ import pytest import IPython from IPython import paths from IPython.testing import decorators as dec -from IPython.testing.decorators import (skip_if_not_win32, skip_win32, - onlyif_unicode_paths, - skip_win32_py38,) +from IPython.testing.decorators import ( + skip_if_not_win32, + skip_win32, + onlyif_unicode_paths, +) from IPython.testing.tools import make_tempfile from IPython.utils import path from IPython.utils.tempdir import TemporaryDirectory @@ -138,7 +140,7 @@ def test_get_home_dir_2(): assert home_dir == unfrozen -@skip_win32_py38 +@skip_win32 @with_environment def test_get_home_dir_3(): """get_home_dir() uses $HOME if set""" @@ -156,7 +158,7 @@ def test_get_home_dir_4(): # this should still succeed, but we don't care what the answer is home = path.get_home_dir(False) -@skip_win32_py38 +@skip_win32 @with_environment def test_get_home_dir_5(): """raise HomeDirError if $HOME is specified, but not a writable dir"""