upstream/ipython Commit - r6906:7e14db60

First full decoupling of magics into a standalone object.

Fernando Perez -

r6906:7e14db60

parent child

IPython/core/completer.py

0 +2 -2

                     # List where completion matches will be stored
                     self.matches = []
-                    self.shell = shell.shell
+                    self.shell = shell
                     if alias_table is None:
                         alias_table = {}
                     self.alias_table = alias_table
                     #print 'Completer->magic_matches:',text,'lb',self.text_until_cursor # dbg
                     # Get all shell magics now rather than statically, so magics loaded at
                     # runtime show up too
-                    magics = self.shell.lsmagic()
+                    magics = self.shell._magic.lsmagic()
                     pre = self.magic_escape
                     baretext = text.lstrip(pre)
                     return [ pre+m for m in magics if m.startswith(baretext)]

IPython/core/interactiveshell.py

0 +18 -13

             # Main IPython class
             #-----------------------------------------------------------------------------
-            class InteractiveShell(SingletonConfigurable, Magic):
+            class InteractiveShell(SingletonConfigurable):
                 """An enhanced, interactive shell for Python."""
                 _instance = None
                     self.init_encoding()
                     self.init_prefilter()
-                    Magic.__init__(self, self)
+                    self._magic = Magic(self)
                     self.init_syntax_highlighting()
                     self.init_hooks()
                     """Initialize logging in case it was requested at the command line.
                     """
                     if self.logappend:
-                        self.magic_logstart(self.logappend + ' append')
+                        self.magic('logstart %s append' % self.logappend)
                     elif self.logfile:
-                        self.magic_logstart(self.logfile)
+                        self.magic('logstart %' % self.logfile)
                     elif self.logstart:
-                        self.magic_logstart()
+                        self.magic('logstart')
                 def init_builtins(self):
                     # A single, static flag that we set to True.  Its presence indicates
                     if not found:
                         if oname.startswith(ESC_MAGIC):
                             oname = oname[1:]
-                        obj = getattr(self,'magic_'+oname,None)
+                        obj = self.find_magic(oname)
                         if obj is not None:
                             found = True
                             ospace = 'IPython internal'
                     # FIXME: Move the color initialization to the DisplayHook, which
                     # should be split into a prompt manager and displayhook. We probably
                     # even need a centralize colors management object.
-                    self.magic_colors(self.colors)
+                    self.magic('colors %s' % self.colors)
                     # History was moved to a separate module
                     from IPython.core import history
                     history.init_ipython(self)
                     magic_name, _, magic_args = arg_s.partition(' ')
                     magic_name = magic_name.lstrip(prefilter.ESC_MAGIC)
-                    fn = getattr(self,'magic_'+magic_name,None)
+                    fn = self.find_magic(magic_name)
                     if fn is None:
                         error("Magic function `%s` not found." % magic_name)
                     else:
-                        magic_args = self.var_expand(magic_args,1)
+                        magic_args = self.var_expand(magic_args, 1)
                         # Grab local namespace if we need it:
                         if getattr(fn, "needs_local_scope", False):
                             self._magic_locals = sys._getframe(1).f_locals
                         self._magic_locals = {}
                         return result
-                def define_magic(self, magicname, func):
+                def define_magic(self, magic_name, func):
                     """Expose own function as magic function for ipython
                     Example::
                       ip.define_magic('foo',foo_impl)
                     """
                     im = types.MethodType(func,self)
-                    old = getattr(self, "magic_" + magicname, None)
+                    old = self.find_magic(magic_name)
-                    setattr(self, "magic_" + magicname, im)
+                    setattr(self._magic, 'magic_' + magic_name, im)
                     return old
+                def find_magic(self, magic_name):
+                    """Find and return a magic function by name.
+                    """
+                    return getattr(self._magic, 'magic_' + magic_name, None)
                 #-------------------------------------------------------------------------
                 # Things related to macros
                 #-------------------------------------------------------------------------
                     # Now we must activate the gui pylab wants to use, and fix %run to take
                     # plot updates into account
                     self.enable_gui(gui)
-                    self.magic_run = self._pylab_magic_run
+                    self._magic.magic_run = self._pylab_magic_run
                 #-------------------------------------------------------------------------
                 # Utilities

IPython/core/magic.py

0 +4 -4

             # Configurable. This messes up the MRO in some way. The fix is that we need to
             # make Magic a configurable that InteractiveShell does not subclass.
-            class Magic:
+            class Magic(object):
                 """Magic functions for InteractiveShell.
                 Shell functions which can be reached as %function_name. All magic
                 #......................................................................
                 # some utility functions
-                def __init__(self,shell):
+                def __init__(self, shell):
                     self.options_table = {}
                     if profile is None:
                     # jump to bookmark if needed
                     else:
                         if not os.path.isdir(ps) or opts.has_key('b'):
-                            bkms = self.db.get('bookmarks', {})
+                            bkms = self.shell.db.get('bookmarks', {})
                             if bkms.has_key(ps):
                                 target = bkms[ps]
                         if oldcwd != cwd:
                             dhist.append(cwd)
-                            self.db['dhist'] = compress_dhist(dhist)[-100:]
+                            self.shell.db['dhist'] = compress_dhist(dhist)[-100:]
                     if not 'q' in opts and self.shell.user_ns['_dh']:
                         print self.shell.user_ns['_dh'][-1]

IPython/core/splitinput.py

0 +1 -1

                     """
                     if not self._oinfo:
                         # ip.shell._ofind is actually on the Magic class!
-                        self._oinfo = ip.shell._ofind(self.ifun)
+                        self._oinfo = ip._ofind(self.ifun)
                     return self._oinfo
                 def __str__(self):

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages