wildcard.py => utils/wildcard.py and updated imports.

IPython/core/magic.py

@@ -43,7 +43,7 b' 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

IPython/core/oinspect.py

@@ -30,7 +30,7 b' 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 *
 
 #****************************************************************************

IPython/utils/tests/test_imports.py

@@ -30,3 +30,6 b' def test_import_strdispatch():'
 
 def test_import_upgradedir():
     from IPython.utils import upgradedir
+
+def test_import_wildcard():
+    from IPython.utils import wildcard

docs/source/development/reorg.txt

@@ -239,11 +239,11 b' 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`.