Move UserMagics to core.magics

IPython/core/interactiveshell.py

@@ -1997,7 +1997,7 b' class InteractiveShell(SingletonConfigurable):'
         from IPython.core import magics as m
         self.magics_manager = magic.MagicsManager(shell=self,
                                    confg=self.config,
-                                   user_magics=mf.UserMagics(self))
+                                   user_magics=m.UserMagics(self))
         self.configurables.append(self.magics_manager)
 
         # Expose as public API from the magics manager

IPython/core/magic.py

@@ -165,7 +165,7 b' class MagicsManager(Configurable):'
         'Automagic is OFF, % prefix IS needed for magic functions.',
         'Automagic is ON, % prefix IS NOT needed for magic functions.']
 
-    user_magics = Instance('IPython.core.magic_functions.UserMagics')
+    user_magics = Instance('IPython.core.magics.UserMagics')
 
     def __init__(self, shell=None, config=None, user_magics=None, **traits):
 

IPython/core/magic_functions.py

@@ -61,20 +61,6 b' from IPython.utils.text import format_screen'
 from IPython.utils.timing import clock, clock2
 from IPython.utils.warn import warn, error
 
-#-----------------------------------------------------------------------------
-# Magic implementation classes
-#-----------------------------------------------------------------------------
-
-@register_magics
-class UserMagics(Magics):
-    """Placeholder for user-defined magics to be added at runtime.
-
-    All magics are eventually merged into a single namespace at runtime, but we
-    use this class to isolate the magics defined dynamically by the user into
-    their own class.
-    """
-
-
 @register_magics
 class BasicMagics(Magics):
     """Magics that provide central IPython functionality.

IPython/core/magics/__init__.py

@@ -11,4 +11,19 b''
 #-----------------------------------------------------------------------------
 # Imports
 #-----------------------------------------------------------------------------
+from IPython.core.magic import Magics, register_magics
 from history import (HistoryMagics)
+
+
+#-----------------------------------------------------------------------------
+# Magic implementation classes
+#-----------------------------------------------------------------------------
+
+@register_magics
+class UserMagics(Magics):
+    """Placeholder for user-defined magics to be added at runtime.
+
+    All magics are eventually merged into a single namespace at runtime, but we
+    use this class to isolate the magics defined dynamically by the user into
+    their own class.
+    """