diff --git a/IPython/genutils.py b/IPython/genutils.py index d4fc9b9..ee0ef66 100644 --- a/IPython/genutils.py +++ b/IPython/genutils.py @@ -47,7 +47,8 @@ else: # Other IPython utilities import IPython from IPython.Itpl import Itpl,itpl,printpl -from IPython import DPyGetOpt, platutils +from IPython import platutils +from IPython.utils import DPyGetOpt from IPython.generics import result_display import IPython.ipapi from IPython.external.path import path diff --git a/IPython/ipmaker.py b/IPython/ipmaker.py index 1bfbdd9..64141b9 100644 --- a/IPython/ipmaker.py +++ b/IPython/ipmaker.py @@ -44,7 +44,7 @@ import sys from pprint import pprint # Our own -from IPython import DPyGetOpt +from IPython.utils import DPyGetOpt from IPython import Release from IPython.ipstruct import Struct from IPython.OutputTrap import OutputTrap diff --git a/IPython/DPyGetOpt.py b/IPython/utils/DPyGetOpt.py similarity index 100% rename from IPython/DPyGetOpt.py rename to IPython/utils/DPyGetOpt.py diff --git a/IPython/utils/tests/test_imports.py b/IPython/utils/tests/test_imports.py index e7350f7..4be75e8 100644 --- a/IPython/utils/tests/test_imports.py +++ b/IPython/utils/tests/test_imports.py @@ -4,3 +4,6 @@ def test_import_coloransi(): from IPython.utils import coloransi +def test_import_DPyGetOpt(): + from IPython.utils import DPyGetOpt + diff --git a/docs/source/development/reorg.txt b/docs/source/development/reorg.txt index 385591c..fe21d14 100644 --- a/docs/source/development/reorg.txt +++ b/docs/source/development/reorg.txt @@ -103,8 +103,7 @@ Where things will be moved * :file:`demo.py`. Move to :file:`IPython/lib/demo.py`. - -* :file:`DPyGetOpt.py`. Move to :mod:`IPython.sandbox` and replace with newer options parser. +* :file:`DPyGetOpt.py`. Move to :mod:`IPython.utils` and replace with newer options parser. * :file:`Extensions`. This needs to be gone through separately. Minimally, the package should be renamed to :file:`extensions`.