Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b835cc1

Browse files
committed
remove last bits of pre-38 codepath.
Closes #13316
1 parent cdf8209 commit b835cc1

4 files changed

Lines changed: 10 additions & 17 deletions

File tree

IPython/terminal/shortcuts.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,9 @@ def _(event):
163163
kb.add(*keys, filter=focused_insert & ebivim)(cmd)
164164

165165
def get_input_mode(self):
166-
if sys.version_info[0] == 3:
167-
app = get_app()
168-
app.ttimeoutlen = shell.ttimeoutlen
169-
app.timeoutlen = shell.timeoutlen
166+
app = get_app()
167+
app.ttimeoutlen = shell.ttimeoutlen
168+
app.timeoutlen = shell.timeoutlen
170169

171170
return self._input_mode
172171

IPython/testing/decorators.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,6 @@ def module_not_available(module):
162162

163163
skip_if_no_x11 = skipif(_x11_skip_cond, _x11_skip_msg)
164164

165-
166-
# Decorators to skip certain tests on specific platform/python combinations
167-
skip_win32_py38 = skipif(sys.version_info > (3,8) and os.name == 'nt')
168-
169-
170165
# Other skip decorators
171166

172167
# generic skip without module

IPython/testing/tools.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,6 @@ def ipexec(fname, options=None, commands=()):
191191
# Absolute path for filename
192192
full_fname = os.path.join(test_dir, fname)
193193
full_cmd = ipython_cmd + cmdargs + ['--', full_fname]
194-
if sys.platform == "win32" and sys.version_info < (3, 8):
195-
# subprocess.Popen does not support Path objects yet
196-
full_cmd = list(map(str, full_cmd))
197194
env = os.environ.copy()
198195
# FIXME: ignore all warnings in ipexec while we have shims
199196
# should we keep suppressing warnings here, even after removing shims?

IPython/utils/tests/test_path.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@
1919
import IPython
2020
from IPython import paths
2121
from IPython.testing import decorators as dec
22-
from IPython.testing.decorators import (skip_if_not_win32, skip_win32,
23-
onlyif_unicode_paths,
24-
skip_win32_py38,)
22+
from IPython.testing.decorators import (
23+
skip_if_not_win32,
24+
skip_win32,
25+
onlyif_unicode_paths,
26+
)
2527
from IPython.testing.tools import make_tempfile
2628
from IPython.utils import path
2729
from IPython.utils.tempdir import TemporaryDirectory
@@ -138,7 +140,7 @@ def test_get_home_dir_2():
138140
assert home_dir == unfrozen
139141

140142

141-
@skip_win32_py38
143+
@skip_win32
142144
@with_environment
143145
def test_get_home_dir_3():
144146
"""get_home_dir() uses $HOME if set"""
@@ -156,7 +158,7 @@ def test_get_home_dir_4():
156158
# this should still succeed, but we don't care what the answer is
157159
home = path.get_home_dir(False)
158160

159-
@skip_win32_py38
161+
@skip_win32
160162
@with_environment
161163
def test_get_home_dir_5():
162164
"""raise HomeDirError if $HOME is specified, but not a writable dir"""

0 commit comments

Comments
 (0)