##// END OF EJS Templates
Merge pull request #1931 from jstenar/win-py3fixes...
Min RK -
r7529:ec39d752 merge
parent child Browse files
Show More
@@ -154,8 +154,8 b' def getoutput(cmd):'
154 out = process_handler(cmd, lambda p: p.communicate()[0], STDOUT)
154 out = process_handler(cmd, lambda p: p.communicate()[0], STDOUT)
155
155
156 if out is None:
156 if out is None:
157 out = ''
157 out = b''
158 return out
158 return py3compat.bytes_to_str(out)
159
159
160 try:
160 try:
161 CommandLineToArgvW = ctypes.windll.shell32.CommandLineToArgvW
161 CommandLineToArgvW = ctypes.windll.shell32.CommandLineToArgvW
@@ -21,10 +21,10 b' import warnings'
21 from hashlib import md5
21 from hashlib import md5
22
22
23 import IPython
23 import IPython
24 from IPython.testing.skipdoctest import skip_doctest
24 from IPython.utils.process import system
25 from IPython.utils.process import system
25 from IPython.utils.importstring import import_item
26 from IPython.utils.importstring import import_item
26 from IPython.utils import py3compat
27 from IPython.utils import py3compat
27
28 #-----------------------------------------------------------------------------
28 #-----------------------------------------------------------------------------
29 # Code
29 # Code
30 #-----------------------------------------------------------------------------
30 #-----------------------------------------------------------------------------
@@ -40,6 +40,7 b' def _writable_dir(path):'
40 return os.path.isdir(path) and os.access(path, os.W_OK)
40 return os.path.isdir(path) and os.access(path, os.W_OK)
41
41
42 if sys.platform == 'win32':
42 if sys.platform == 'win32':
43 @skip_doctest
43 def _get_long_path_name(path):
44 def _get_long_path_name(path):
44 """Get a long path name (expand ~) on Windows using ctypes.
45 """Get a long path name (expand ~) on Windows using ctypes.
45
46
General Comments 0
You need to be logged in to leave comments. Login now