From 5457c4cdff89f04d06c79ab58acdd90371feb0b3 2009-07-02 18:39:49
From: Brian Granger <ellisonbg@gmail.com>
Date: 2009-07-02 18:39:49
Subject: [PATCH] usage.py => core/usage.py and imports updated.

---

diff --git a/IPython/core/ipmaker.py b/IPython/core/ipmaker.py
index 059820a..ee879e6 100644
--- a/IPython/core/ipmaker.py
+++ b/IPython/core/ipmaker.py
@@ -50,7 +50,7 @@ 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):
diff --git a/IPython/core/magic.py b/IPython/core/magic.py
index 97335c5..f80b641 100644
--- a/IPython/core/magic.py
+++ b/IPython/core/magic.py
@@ -3333,8 +3333,8 @@ 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)
         
diff --git a/IPython/core/tests/test_imports.py b/IPython/core/tests/test_imports.py
index 2cb3a75..c95ee8d 100644
--- a/IPython/core/tests/test_imports.py
+++ b/IPython/core/tests/test_imports.py
@@ -66,3 +66,6 @@ def test_import_shellglobals():
 
 def test_import_ultratb():
     from IPython.core import ultratb
+
+def test_import_usage():
+    from IPython.core import usage
diff --git a/IPython/usage.py b/IPython/core/usage.py
similarity index 100%
rename from IPython/usage.py
rename to IPython/core/usage.py