From c367e1e7c997c792a9e51c883b85289152049157 2009-07-02 18:50:40
From: Brian Granger <ellisonbg@gmail.com>
Date: 2009-07-02 18:50:40
Subject: [PATCH] wildcard.py => utils/wildcard.py and updated imports.

---

diff --git a/IPython/core/magic.py b/IPython/core/magic.py
index f80b641..8d6aaac 100644
--- a/IPython/core/magic.py
+++ b/IPython/core/magic.py
@@ -43,7 +43,7 @@ except ImportError:
 
 # Homebrewed
 import IPython
-from IPython import wildcard
+from IPython.utils import wildcard
 from IPython.core import debugger, oinspect
 from IPython.core.fakemodule import FakeModule
 from IPython.external.Itpl import Itpl, itpl, printpl,itplns
diff --git a/IPython/core/oinspect.py b/IPython/core/oinspect.py
index a134aac..b5661b3 100644
--- a/IPython/core/oinspect.py
+++ b/IPython/core/oinspect.py
@@ -30,7 +30,7 @@ import types
 from IPython.utils import PyColorize
 from IPython.utils.genutils import page,indent,Term
 from IPython.external.Itpl import itpl
-from IPython.wildcard import list_namespace
+from IPython.utils.wildcard import list_namespace
 from IPython.utils.coloransi import *
 
 #****************************************************************************
diff --git a/IPython/utils/tests/test_imports.py b/IPython/utils/tests/test_imports.py
index 3a38b3b..e8c2060 100644
--- a/IPython/utils/tests/test_imports.py
+++ b/IPython/utils/tests/test_imports.py
@@ -30,3 +30,6 @@ def test_import_strdispatch():
 
 def test_import_upgradedir():
     from IPython.utils import upgradedir
+
+def test_import_wildcard():
+    from IPython.utils import wildcard
diff --git a/IPython/wildcard.py b/IPython/utils/wildcard.py
similarity index 100%
rename from IPython/wildcard.py
rename to IPython/utils/wildcard.py
diff --git a/docs/source/development/reorg.txt b/docs/source/development/reorg.txt
index ac282c8..d11dae3 100644
--- a/docs/source/development/reorg.txt
+++ b/docs/source/development/reorg.txt
@@ -239,11 +239,11 @@ Where things will be moved
 
 * :file:`ultraTB.py`.  Move to :file:`IPython/core/ultratb.py`.
 
-* :file:`upgrade_dir.py`.  Move to :file:`IPython/python/upgradedir.py`.
+* :file:`upgrade_dir.py`.  Move to :file:`IPython/utils/upgradedir.py`.
 
 * :file:`usage.py`.  Move to :file:`IPython.core`.
 
-* :file:`wildcard.py`.  Move to :file:`IPython.python` or :file:`IPython.core`.
+* :file:`wildcard.py`.  Move to :file:`IPython.utils`.
 
 * :file:`winconsole.py`.  Move to :file:`IPython.lib`.