Move magic_loadpy from GUI-specific magics to core magics.

IPython/core/magic.py

@@ -2094,6 +2094,24 b' Currently the magic system has the following functions:\\n"""'
         id = pbserver.pastes.newPaste("python", code)
         return "http://paste.pocoo.org/show/" + id
 
+    def magic_loadpy(self, arg_s):
+        """Load a .py python script into the GUI console.
+
+        This magic command can either take a local filename or a url::
+
+        %loadpy myscript.py
+        %loadpy http://www.example.com/myscript.py
+        """
+        if not arg_s.endswith('.py'):
+            raise ValueError('%%load only works with .py files: %s' % arg_s)
+        if arg_s.startswith('http'):
+            import urllib2
+            response = urllib2.urlopen(arg_s)
+            content = response.read()
+        else:
+            content = open(arg_s).read()
+        self.set_next_input(content)
+
     def _edit_macro(self,mname,macro):
         """open an editor with the macro data in a file"""
         filename = self.shell.mktempfile(macro.value)

IPython/zmq/zmqshell.py

@@ -576,24 +576,6 b' class ZMQInteractiveShell(InteractiveShell):'
         from IPython.core.usage import gui_reference
         page.page(gui_reference, auto_html=True)
 
-    def magic_loadpy(self, arg_s):
-        """Load a .py python script into the GUI console.
-
-        This magic command can either take a local filename or a url::
-
-        %loadpy myscript.py
-        %loadpy http://www.example.com/myscript.py
-        """
-        if not arg_s.endswith('.py'):
-            raise ValueError('%%load only works with .py files: %s' % arg_s)
-        if arg_s.startswith('http'):
-            import urllib2
-            response = urllib2.urlopen(arg_s)
-            content = response.read()
-        else:
-            content = open(arg_s).read()
-        self.set_next_input(content)
-    
     def set_next_input(self, text):
         """Send the specified text to the frontend to be presented at the next
         input cell."""