##// END OF EJS Templates
remove last bits of pre-38 codepath....
Matthias Bussonnier -
Show More
@@ -163,10 +163,9 b' def create_ipython_shortcuts(shell):'
163 163 kb.add(*keys, filter=focused_insert & ebivim)(cmd)
164 164
165 165 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
170 169
171 170 return self._input_mode
172 171
@@ -162,11 +162,6 b' _x11_skip_msg = "Skipped under *nix when X11/XOrg not available"'
162 162
163 163 skip_if_no_x11 = skipif(_x11_skip_cond, _x11_skip_msg)
164 164
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
170 165 # Other skip decorators
171 166
172 167 # generic skip without module
@@ -191,9 +191,6 b' def ipexec(fname, options=None, commands=()):'
191 191 # Absolute path for filename
192 192 full_fname = os.path.join(test_dir, fname)
193 193 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))
197 194 env = os.environ.copy()
198 195 # FIXME: ignore all warnings in ipexec while we have shims
199 196 # should we keep suppressing warnings here, even after removing shims?
@@ -19,9 +19,11 b' import pytest'
19 19 import IPython
20 20 from IPython import paths
21 21 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 )
25 27 from IPython.testing.tools import make_tempfile
26 28 from IPython.utils import path
27 29 from IPython.utils.tempdir import TemporaryDirectory
@@ -138,7 +140,7 b' def test_get_home_dir_2():'
138 140 assert home_dir == unfrozen
139 141
140 142
141 @skip_win32_py38
143 @skip_win32
142 144 @with_environment
143 145 def test_get_home_dir_3():
144 146 """get_home_dir() uses $HOME if set"""
@@ -156,7 +158,7 b' def test_get_home_dir_4():'
156 158 # this should still succeed, but we don't care what the answer is
157 159 home = path.get_home_dir(False)
158 160
159 @skip_win32_py38
161 @skip_win32
160 162 @with_environment
161 163 def test_get_home_dir_5():
162 164 """raise HomeDirError if $HOME is specified, but not a writable dir"""
General Comments 0
You need to be logged in to leave comments. Login now