From eb3ef22eafd8ddad598872aefa43bf13c424f728 2009-07-02 16:26:42
From: Brian Granger <ellisonbg@gmail.com>
Date: 2009-07-02 16:26:42
Subject: [PATCH] All platutils modules to utils, moved tests and updated imports.

---

diff --git a/IPython/core/magic.py b/IPython/core/magic.py
index 668bdaf..ddc5d16 100644
--- a/IPython/core/magic.py
+++ b/IPython/core/magic.py
@@ -51,7 +51,7 @@ from IPython.PyColorize import Parser
 from IPython.utils.ipstruct import Struct
 from IPython.core.macro import Macro
 from IPython.utils.genutils import *
-from IPython import platutils
+from IPython.utils import platutils
 import IPython.utils.generics
 from IPython.core import ipapi
 from IPython.core.ipapi import UsageError
diff --git a/IPython/testing/iptest.py b/IPython/testing/iptest.py
index b866cf5..f829759 100644
--- a/IPython/testing/iptest.py
+++ b/IPython/testing/iptest.py
@@ -30,7 +30,7 @@ import warnings
 import nose.plugins.builtin
 from nose.core import TestProgram
 
-from IPython.platutils import find_cmd
+from IPython.utils.platutils import find_cmd
 from IPython.testing.plugin.ipdoctest import IPythonDoctest
 
 pjoin = path.join
diff --git a/IPython/tests/test_magic.py b/IPython/tests/test_magic.py
index 77bdd89..74c2bcc 100644
--- a/IPython/tests/test_magic.py
+++ b/IPython/tests/test_magic.py
@@ -10,7 +10,7 @@ import types
 
 import nose.tools as nt
 
-from IPython.platutils import find_cmd, get_long_path_name
+from IPython.utils.platutils import find_cmd, get_long_path_name
 from IPython.testing import decorators as dec
 from IPython.testing import tools as tt
 
diff --git a/IPython/utils/genutils.py b/IPython/utils/genutils.py
index e320cbe..440c21e 100644
--- a/IPython/utils/genutils.py
+++ b/IPython/utils/genutils.py
@@ -47,7 +47,7 @@ else:
 # Other IPython utilities
 import IPython
 from IPython.external.Itpl import Itpl,itpl,printpl
-from IPython import platutils
+from IPython.utils import platutils
 from IPython.utils import DPyGetOpt
 from IPython.utils.generics import result_display
 from IPython.core import ipapi
diff --git a/IPython/platutils.py b/IPython/utils/platutils.py
similarity index 100%
rename from IPython/platutils.py
rename to IPython/utils/platutils.py
diff --git a/IPython/platutils_dummy.py b/IPython/utils/platutils_dummy.py
similarity index 100%
rename from IPython/platutils_dummy.py
rename to IPython/utils/platutils_dummy.py
diff --git a/IPython/platutils_posix.py b/IPython/utils/platutils_posix.py
similarity index 100%
rename from IPython/platutils_posix.py
rename to IPython/utils/platutils_posix.py
diff --git a/IPython/platutils_win32.py b/IPython/utils/platutils_win32.py
similarity index 100%
rename from IPython/platutils_win32.py
rename to IPython/utils/platutils_win32.py
diff --git a/IPython/utils/tests/test_imports.py b/IPython/utils/tests/test_imports.py
index 654bd83..4e58704 100644
--- a/IPython/utils/tests/test_imports.py
+++ b/IPython/utils/tests/test_imports.py
@@ -16,4 +16,6 @@ def test_import_genutils():
 def test_import_ipstruct():
     from IPython.utils import ipstruct
 
+def test_import_platutils():
+    from IPython.utils import platutils
 
diff --git a/IPython/tests/test_platutils.py b/IPython/utils/tests/test_platutils.py
similarity index 97%
rename from IPython/tests/test_platutils.py
rename to IPython/utils/tests/test_platutils.py
index 36d189f..4446789 100644
--- a/IPython/tests/test_platutils.py
+++ b/IPython/utils/tests/test_platutils.py
@@ -20,7 +20,7 @@ import sys
 
 import nose.tools as nt
 
-from IPython.platutils import find_cmd, FindCmdError, get_long_path_name
+from IPython.utils.platutils import find_cmd, FindCmdError, get_long_path_name
 from IPython.testing import decorators as dec
 
 #-----------------------------------------------------------------------------