##// END OF EJS Templates
skip %HOME% 3.8 test on windows, update docs for get_home_dir
Nicholas Bollweg -
Show More
@@ -175,7 +175,8 b' def get_home_dir(require_writable=False):'
175 Uses os.path.expanduser('~'), and checks for writability.
175 Uses os.path.expanduser('~'), and checks for writability.
176
176
177 See stdlib docs for how this is determined.
177 See stdlib docs for how this is determined.
178 $HOME is first priority on *ALL* platforms.
178 For Python <3.8, $HOME is first priority on *ALL* platforms.
179 For Python >=3.8 on Windows, %HOME% is no longer considered.
179
180
180 Parameters
181 Parameters
181 ----------
182 ----------
@@ -28,7 +28,7 b' from IPython.utils.tempdir import TemporaryDirectory'
28
28
29 # Platform-dependent imports
29 # Platform-dependent imports
30 try:
30 try:
31 import winreg as wreg
31 import winreg as wreg
32 except ImportError:
32 except ImportError:
33 #Fake _winreg module on non-windows platforms
33 #Fake _winreg module on non-windows platforms
34 import types
34 import types
@@ -128,6 +128,7 b' def test_get_home_dir_2():'
128 nt.assert_equal(home_dir, unfrozen)
128 nt.assert_equal(home_dir, unfrozen)
129
129
130
130
131 @skipif(sys.version_info > (3,8) and os.name == 'nt')
131 @with_environment
132 @with_environment
132 def test_get_home_dir_3():
133 def test_get_home_dir_3():
133 """get_home_dir() uses $HOME if set"""
134 """get_home_dir() uses $HOME if set"""
@@ -247,7 +248,7 b' def test_filefind():'
247 def test_get_long_path_name_win32():
248 def test_get_long_path_name_win32():
248 with TemporaryDirectory() as tmpdir:
249 with TemporaryDirectory() as tmpdir:
249
250
250 # Make a long path. Expands the path of tmpdir prematurely as it may already have a long
251 # Make a long path. Expands the path of tmpdir prematurely as it may already have a long
251 # path component, so ensure we include the long form of it
252 # path component, so ensure we include the long form of it
252 long_path = os.path.join(path.get_long_path_name(tmpdir), 'this is my long path name')
253 long_path = os.path.join(path.get_long_path_name(tmpdir), 'this is my long path name')
253 os.makedirs(long_path)
254 os.makedirs(long_path)
@@ -311,7 +312,7 b' def test_get_py_filename():'
311 def test_unicode_in_filename():
312 def test_unicode_in_filename():
312 """When a file doesn't exist, the exception raised should be safe to call
313 """When a file doesn't exist, the exception raised should be safe to call
313 str() on - i.e. in Python 2 it must only have ASCII characters.
314 str() on - i.e. in Python 2 it must only have ASCII characters.
314
315
315 https://github.com/ipython/ipython/issues/875
316 https://github.com/ipython/ipython/issues/875
316 """
317 """
317 try:
318 try:
General Comments 0
You need to be logged in to leave comments. Login now