UserConfig => config/userconfig and imports updated.

IPython/config/tests/test_imports.py

@@ -4,3 +4,7 b''
 def test_import_configloader():
     from IPython.config import configloader
 
+def test_import_userconfig():
+    from IPython.config import userconfig
+
+

IPython/core/iplib.py

@@ -167,7 +167,7 b' where you can customize many aspects of IPython\'s functionality in:\\n""")'
 
     printf(ipythondir)
 
-    rcdirend = os.path.join('IPython','UserConfig')
+    rcdirend = os.path.join('IPython','config','userconfig')
     cfg = lambda d: os.path.join(d,rcdirend)
     try:
         rcdir = filter(os.path.isdir,map(cfg,sys.path))[0]

IPython/core/magic.py

@@ -3352,7 +3352,7 b' Defaulting color scheme to \'NoColor\'"""'
         ip = self.getapi()
         ipinstallation = path(IPython.__file__).dirname()
         upgrade_script = '%s "%s"' % (sys.executable,ipinstallation / 'utils' / 'upgradedir.py')
-        src_config = ipinstallation / 'UserConfig'
+        src_config = ipinstallation / 'config' / 'userconfig'
         userdir = path(ip.options.ipythondir)
         cmd = '%s "%s" "%s"' % (upgrade_script, src_config, userdir)
         print ">",cmd

IPython/testing/iptest.py

@@ -224,7 +224,7 b' def make_runners():'
 
     # These are tested by nose, so skip IPython.kernel
     top_pack = ['config','Extensions','frontend',
-                'testing','tests','tools','UserConfig']
+                'testing','tests','tools','userconfig']
 
     if have_wx:
         top_pack.append('gui')

IPython/testing/plugin/ipdoctest.py

@@ -64,8 +64,8 b' def default_argv():'
 
     # Get the install directory for the user configuration and tell ipython to
     # use the default profile from there.
-    from IPython import UserConfig
-    ipcdir = os.path.dirname(UserConfig.__file__)
+    from IPython.config import userconfig
+    ipcdir = os.path.dirname(userconfig.__file__)
     #ipconf = os.path.join(ipcdir,'ipy_user_conf.py')
     ipconf = os.path.join(ipcdir,'ipythonrc')
     #print 'conf:',ipconf # dbg

docs/source/development/reorg.txt

@@ -204,12 +204,12 b' Top-level sub-packages:'
 
 * :file:`testing`.  Good where it is.
 
-* :file:`tests`.  Good where it is.
+* :file:`tests`.  Remove.
 
 * :file:`tools`.  Things in here need to be looked at and moved elsewhere like
     :file:`IPython.utils`.
 
-* :file:`UserConfig`.  Move to a subdirectory of :file:`IPython.config`.
+* :file:`UserConfig`.  Move to :file:`IPython.config.userconfig`.
 
 * :file:`config`.  Good where it is!
 
@@ -217,8 +217,6 b' Top-level sub-packages:'
 
 * :file:`frontend`.  Good where it is!
 
-
-
 * :file:`gui`.  Eventually this should be moved to a subdir of   
   :file:`IPython.frontend`.