usage.py => core/usage.py and imports updated.

IPython/core/ipmaker.py

@@ -50,7 +50,7 b' from IPython.utils.ipstruct import Struct'
 from IPython.core.outputtrap import OutputTrap
 from IPython.config.configloader import ConfigLoader
 from IPython.core.iplib import InteractiveShell
-from IPython.usage import cmd_line_usage,interactive_usage
+from IPython.core.usage import cmd_line_usage, interactive_usage
 from IPython.utils.genutils import *
 
 def force_import(modname,force_reload=False):

IPython/core/magic.py

@@ -3333,8 +3333,8 b' Defaulting color scheme to \'NoColor\'"""'
             
     def magic_quickref(self,arg):
         """ Show a quick reference sheet """
-        import IPython.usage
-        qr = IPython.usage.quick_reference + self.magic_magic('-brief')
+        import IPython.core.usage
+        qr = IPython.core.usage.quick_reference + self.magic_magic('-brief')
         
         page(qr)
         

IPython/core/tests/test_imports.py

@@ -66,3 +66,6 b' def test_import_shellglobals():'
 
 def test_import_ultratb():
     from IPython.core import ultratb
+
+def test_import_usage():
+    from IPython.core import usage