Fix #10327: Test fails handled and magic() backward compatibilty added

IPython/core/interactiveshell.py

@@ -2044,7 +2044,7 b' class InteractiveShell(SingletonConfigurable):'
         self.magics_manager.register_function(func, 
                                   magic_kind=magic_kind, magic_name=magic_name)
 
-    def run_line_magic(self, magic_name, line):
+    def run_line_magic(self, magic_name, line, back_compat=False):
         """Execute the given line magic.
 
         Parameters
@@ -2054,6 +2054,10 b' class InteractiveShell(SingletonConfigurable):'
 
         line : str
           The rest of the input line as a single string.
+          
+        back_compat : bool
+          If run_line_magic() is called from magic() then it should be 'True'.
+          This is added to ensure backward compatibility for use of 'get_ipython().magic()'
         """
         fn = self.find_line_magic(magic_name)
         if fn is None:
@@ -2066,7 +2070,13 b' class InteractiveShell(SingletonConfigurable):'
             # Note: this is the distance in the stack to the user's frame.
             # This will need to be updated if the internal calling logic gets
             # refactored, or else we'll be expanding the wrong variables.
-            stack_depth = 2
+            # Determine stack_depth depending on where run_line_magic() has been called
+            if back_compat:
+                # run_line_magic() called directly using 'get_ipython().magic()'
+                stack_depth = 2
+            else:
+                # run_line_magic() called directly using 'get_ipython().run_line_magic()'
+                stack_depth = 1
             magic_arg_s = self.var_expand(line, stack_depth)
             # Put magic args in a list so we can call with f(*a) syntax
             args = [magic_arg_s]
@@ -2154,7 +2164,7 b' class InteractiveShell(SingletonConfigurable):'
         # TODO: should we issue a loud deprecation warning here?
         magic_name, _, magic_arg_s = arg_s.partition(' ')
         magic_name = magic_name.lstrip(prefilter.ESC_MAGIC)
-        return self.run_line_magic(magic_name, magic_arg_s)
+        return self.run_line_magic(magic_name, magic_arg_s, back_compat=True)
 
     #-------------------------------------------------------------------------
     # Things related to macros

IPython/core/tests/test_inputtransformer.py

@@ -112,7 +112,7 b' syntax = \\'
         (u'%hist1?', "get_ipython().run_line_magic({u}'pinfo', {u}'%hist1')"),
         (u'%hist2??', "get_ipython().run_line_magic({u}'pinfo2', {u}'%hist2')"),
         (u'%%hist3?', "get_ipython().run_line_magic({u}'pinfo', {u}'%%hist3')"),
-        (u'%%hist4??', "get_ipython().run_line_magic({u}'pinfo2', {u}'%%hist2')"),
+        (u'%%hist4??', "get_ipython().run_line_magic({u}'pinfo2', {u}'%%hist4')"),
         (u'f*?', "get_ipython().run_line_magic({u}'psearch', {u}'f*')"),
         (u'ax.*aspe*?', "get_ipython().run_line_magic({u}'psearch', {u}'ax.*aspe*')"),
         (u'a = abc?', "get_ipython().set_next_input({u}'a = abc');"