##// END OF EJS Templates
All platutils modules to utils, moved tests and updated imports.
Brian Granger -
Show More
@@ -51,7 +51,7 b' from IPython.PyColorize import Parser'
51 from IPython.utils.ipstruct import Struct
51 from IPython.utils.ipstruct import Struct
52 from IPython.core.macro import Macro
52 from IPython.core.macro import Macro
53 from IPython.utils.genutils import *
53 from IPython.utils.genutils import *
54 from IPython import platutils
54 from IPython.utils import platutils
55 import IPython.utils.generics
55 import IPython.utils.generics
56 from IPython.core import ipapi
56 from IPython.core import ipapi
57 from IPython.core.ipapi import UsageError
57 from IPython.core.ipapi import UsageError
@@ -30,7 +30,7 b' import warnings'
30 import nose.plugins.builtin
30 import nose.plugins.builtin
31 from nose.core import TestProgram
31 from nose.core import TestProgram
32
32
33 from IPython.platutils import find_cmd
33 from IPython.utils.platutils import find_cmd
34 from IPython.testing.plugin.ipdoctest import IPythonDoctest
34 from IPython.testing.plugin.ipdoctest import IPythonDoctest
35
35
36 pjoin = path.join
36 pjoin = path.join
@@ -10,7 +10,7 b' import types'
10
10
11 import nose.tools as nt
11 import nose.tools as nt
12
12
13 from IPython.platutils import find_cmd, get_long_path_name
13 from IPython.utils.platutils import find_cmd, get_long_path_name
14 from IPython.testing import decorators as dec
14 from IPython.testing import decorators as dec
15 from IPython.testing import tools as tt
15 from IPython.testing import tools as tt
16
16
@@ -47,7 +47,7 b' else:'
47 # Other IPython utilities
47 # Other IPython utilities
48 import IPython
48 import IPython
49 from IPython.external.Itpl import Itpl,itpl,printpl
49 from IPython.external.Itpl import Itpl,itpl,printpl
50 from IPython import platutils
50 from IPython.utils import platutils
51 from IPython.utils import DPyGetOpt
51 from IPython.utils import DPyGetOpt
52 from IPython.utils.generics import result_display
52 from IPython.utils.generics import result_display
53 from IPython.core import ipapi
53 from IPython.core import ipapi
1 NO CONTENT: file renamed from IPython/platutils.py to IPython/utils/platutils.py
NO CONTENT: file renamed from IPython/platutils.py to IPython/utils/platutils.py
1 NO CONTENT: file renamed from IPython/platutils_dummy.py to IPython/utils/platutils_dummy.py
NO CONTENT: file renamed from IPython/platutils_dummy.py to IPython/utils/platutils_dummy.py
1 NO CONTENT: file renamed from IPython/platutils_posix.py to IPython/utils/platutils_posix.py
NO CONTENT: file renamed from IPython/platutils_posix.py to IPython/utils/platutils_posix.py
1 NO CONTENT: file renamed from IPython/platutils_win32.py to IPython/utils/platutils_win32.py
NO CONTENT: file renamed from IPython/platutils_win32.py to IPython/utils/platutils_win32.py
@@ -16,4 +16,6 b' def test_import_genutils():'
16 def test_import_ipstruct():
16 def test_import_ipstruct():
17 from IPython.utils import ipstruct
17 from IPython.utils import ipstruct
18
18
19 def test_import_platutils():
20 from IPython.utils import platutils
19
21
@@ -20,7 +20,7 b' import sys'
20
20
21 import nose.tools as nt
21 import nose.tools as nt
22
22
23 from IPython.platutils import find_cmd, FindCmdError, get_long_path_name
23 from IPython.utils.platutils import find_cmd, FindCmdError, get_long_path_name
24 from IPython.testing import decorators as dec
24 from IPython.testing import decorators as dec
25
25
26 #-----------------------------------------------------------------------------
26 #-----------------------------------------------------------------------------
General Comments 0
You need to be logged in to leave comments. Login now