From e223878f8ed69da8c9ac26c5d82ac86b97b20bec 2012-05-26 02:35:19
From: Fernando Perez <Fernando.Perez@berkeley.edu>
Date: 2012-05-26 02:35:19
Subject: [PATCH] Move extract_input_lines to main shell object, where it belongs.

---

diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
index 2643daf..120512c 100644
--- a/IPython/core/interactiveshell.py
+++ b/IPython/core/interactiveshell.py
@@ -2754,6 +2754,29 @@ class InteractiveShell(SingletonConfigurable):
         """Show a usage message"""
         page.page(IPython.core.usage.interactive_usage)
 
+    def extract_input_lines(self, range_str, raw=False):
+        """Return as a string a set of input history slices.
+
+        Parameters
+        ----------
+        range_str : string
+            The set of slices is given as a string, like "~5/6-~4/2 4:8 9",
+            since this function is for use by magic functions which get their
+            arguments as strings. The number before the / is the session
+            number: ~n goes n back from the current session.
+
+        Optional Parameters:
+          - raw(False): by default, the processed input is used.  If this is
+          true, the raw input history is used instead.
+
+        Note that slices can be called with two notations:
+
+        N:M -> standard python form, means including items N...(M-1).
+
+        N-M -> include items N..M (closed endpoint)."""
+        lines = self.history_manager.get_range_by_str(range_str, raw=raw)
+        return "\n".join(x for _, _, x in lines)
+
     def find_user_code(self, target, raw=True, py_only=False):
         """Get a code string from history, file, url, or a string or macro.
 
diff --git a/IPython/core/magic.py b/IPython/core/magic.py
index d54ab01..54bf6de 100644
--- a/IPython/core/magic.py
+++ b/IPython/core/magic.py
@@ -179,30 +179,6 @@ python-profiler package from non-free.""")
         out.sort()
         return out
 
-    def extract_input_lines(self, range_str, raw=False):
-        """Return as a string a set of input history slices.
-
-        Parameters
-        ----------
-        range_str : string
-            The set of slices is given as a string, like "~5/6-~4/2 4:8 9",
-            since this function is for use by magic functions which get their
-            arguments as strings. The number before the / is the session
-            number: ~n goes n back from the current session.
-
-        Optional Parameters:
-          - raw(False): by default, the processed input is used.  If this is
-          true, the raw input history is used instead.
-
-        Note that slices can be called with two notations:
-
-        N:M -> standard python form, means including items N...(M-1).
-
-        N-M -> include items N..M (closed endpoint)."""
-        lines = self.shell.history_manager.\
-                                    get_range_by_str(range_str, raw=raw)
-        return "\n".join(x for _, _, x in lines)
-
     def arg_err(self,func):
         """Print docstring if incorrect arguments were passed"""
         print 'Error in arguments:'
@@ -2370,7 +2346,7 @@ Currently the magic system has the following functions:\n"""
             use_temp = False
         elif args:
             # Mode where user specifies ranges of lines, like in %macro.
-            data = self.extract_input_lines(args, opts_raw)
+            data = self.shell.extract_input_lines(args, opts_raw)
             if not data:
                 try:
                     # Load the parameter given as a variable. If not a string,