ofind finds non-unique cell magics

IPython/core/completer.py

@@ -79,7 +79,7 @@
 
 from IPython.config.configurable import Configurable
 from IPython.core.error import TryNext
-from IPython.core.prefilter import ESC_MAGIC
+from IPython.core.inputsplitter import ESC_MAGIC
 from IPython.utils import generics
 from IPython.utils import io
 from IPython.utils.dir2 import dir2

IPython/core/inputsplitter.py

@@ -91,6 +91,7 @@
 ESC_HELP   = '?'     # Find information about object
 ESC_HELP2  = '??'    # Find extra-detailed information about object
 ESC_MAGIC  = '%'     # Call magic function
+ESC_MAGIC2 = '%%'    # Call cell-magic function
 ESC_QUOTE  = ','     # Split args on whitespace, quote each as string and call
 ESC_QUOTE2 = ';'     # Quote all args as a single string, call
 ESC_PAREN  = '/'     # Call first argument with rest of line as arguments

IPython/core/interactiveshell.py

@@ -56,12 +56,12 @@
 from IPython.core.fakemodule import FakeModule, init_fakemod_dict
 from IPython.core.formatters import DisplayFormatter
 from IPython.core.history import HistoryManager
-from IPython.core.inputsplitter import IPythonInputSplitter
+from IPython.core.inputsplitter import IPythonInputSplitter, ESC_MAGIC, ESC_MAGIC2
 from IPython.core.logger import Logger
 from IPython.core.macro import Macro
 from IPython.core.payload import PayloadManager
 from IPython.core.plugin import PluginManager
-from IPython.core.prefilter import PrefilterManager, ESC_MAGIC
+from IPython.core.prefilter import PrefilterManager
 from IPython.core.profiledir import ProfileDir
 from IPython.core.pylabtools import pylab_activate
 from IPython.core.prompts import PromptManager
@@ -1348,7 +1348,9 @@ def _ofind(self, oname, namespaces=None):
         """
         oname = oname.strip()
         #print '1- oname: <%r>' % oname  # dbg
-        if not py3compat.isidentifier(oname.lstrip(ESC_MAGIC), dotted=True):
+        if not oname.startswith(ESC_MAGIC) and \
+            not oname.startswith(ESC_MAGIC2) and \
+            not py3compat.isidentifier(oname, dotted=True):
             return dict(found=False)
 
         alias_ns = None
@@ -1406,11 +1408,18 @@ def _ofind(self, oname, namespaces=None):
 
         # Try to see if it's magic
         if not found:
-            if oname.startswith(ESC_MAGIC):
-                oname = oname.lstrip(ESC_MAGIC)
-            obj = self.find_line_magic(oname)
-            if obj is None:
+            obj = None
+            if oname.startswith(ESC_MAGIC2):
+                oname = oname.lstrip(ESC_MAGIC2)
                 obj = self.find_cell_magic(oname)
+            elif oname.startswith(ESC_MAGIC):
+                oname = oname.lstrip(ESC_MAGIC)
+                obj = self.find_line_magic(oname)
+            else:
+                # search without prefix, so run? will find %run?
+                obj = self.find_line_magic(oname)
+                if obj is None:
+                    obj = self.find_cell_magic(oname)
             if obj is not None:
                 found = True
                 ospace = 'IPython internal'

IPython/core/magic.py

@@ -25,7 +25,7 @@
 from IPython.config.configurable import Configurable
 from IPython.core import oinspect
 from IPython.core.error import UsageError
-from IPython.core.prefilter import ESC_MAGIC
+from IPython.core.inputsplitter import ESC_MAGIC
 from IPython.external.decorator import decorator
 from IPython.utils.ipstruct import Struct
 from IPython.utils.process import arg_split

IPython/core/magics/basic.py

@@ -20,8 +20,8 @@
 
 # Our own packages
 from IPython.core.error import UsageError
+from IPython.core.inputsplitter import ESC_MAGIC
 from IPython.core.magic import Magics, magics_class, line_magic
-from IPython.core.prefilter import ESC_MAGIC
 from IPython.utils.text import format_screen
 from IPython.core import magic_arguments, page
 from IPython.testing.skipdoctest import skip_doctest

IPython/core/prefilter.py

@@ -31,6 +31,16 @@
 from IPython.core.alias import AliasManager
 from IPython.core.autocall import IPyAutocall
 from IPython.config.configurable import Configurable
+from IPython.core.inputsplitter import (
+    ESC_SHELL,
+    ESC_SH_CAP,
+    ESC_HELP,
+    ESC_MAGIC,
+    ESC_MAGIC2,
+    ESC_QUOTE,
+    ESC_QUOTE2,
+    ESC_PAREN,
+)
 from IPython.core.macro import Macro
 from IPython.core.splitinput import split_user_input, LineInfo
 from IPython.core import page
@@ -44,16 +54,6 @@
 # Global utilities, errors and constants
 #-----------------------------------------------------------------------------
 
-# Warning, these cannot be changed unless various regular expressions
-# are updated in a number of places.  Not great, but at least we told you.
-ESC_SHELL  = '!'
-ESC_SH_CAP = '!!'
-ESC_HELP   = '?'
-ESC_MAGIC  = '%'
-ESC_QUOTE  = ','
-ESC_QUOTE2 = ';'
-ESC_PAREN  = '/'
-
 
 class PrefilterError(Exception):
     pass

IPython/core/tests/test_magic.py

@@ -662,3 +662,35 @@ def test_script_defaults():
             pass
         else:
             nt.assert_in(cmd, ip.magics_manager.magics['cell'])
+
+
+@magics_class
+class FooFoo(Magics):
+    """class with both %foo and %%foo magics"""
+    @line_magic('foo')
+    def line_foo(self, line):
+        "I am line foo"
+        pass
+
+    @cell_magic("foo")
+    def cell_foo(self, line, cell):
+        "I am cell foo, not line foo"
+        pass
+
+def test_line_cell_info():
+    """%%foo and %foo magics are distinguishable to inspect"""
+    ip = get_ipython()
+    ip.magics_manager.register(FooFoo)
+    oinfo = ip.object_inspect('foo')
+    nt.assert_true(oinfo['found'])
+    nt.assert_true(oinfo['ismagic'])
+
+    oinfo = ip.object_inspect('%%foo')
+    nt.assert_true(oinfo['found'])
+    nt.assert_true(oinfo['ismagic'])
+    nt.assert_equals(oinfo['docstring'], FooFoo.cell_foo.__doc__)
+
+    oinfo = ip.object_inspect('%foo')
+    nt.assert_true(oinfo['found'])
+    nt.assert_true(oinfo['ismagic'])
+    nt.assert_equals(oinfo['docstring'], FooFoo.line_foo.__doc__)