Merge pull request #1839 from juliantaylor/external-cleanup

Remove pyparsing and mglob from IPython.externals

IPython/core/prefilter.py

@@ -115,8 +115,7 b' class PrefilterManager(Configurable):'
     The transformers are instances of :class:`PrefilterTransformer` and have
     a single method :meth:`transform` that takes a line and returns a
     transformed line.  The transformation can be accomplished using any
-    tool, but our current ones use regular expressions for speed.  We also
-    ship :mod:`pyparsing` in :mod:`IPython.external` for use in transformers.
+    tool, but our current ones use regular expressions for speed.
 
     After all the transformers have been run, the line is fed to the checkers,
     which are instances of :class:`PrefilterChecker`.  The line is passed to

IPython/deathrow/ipy_profile_sh.py

@@ -115,9 +115,6 b' def main():'
 
             ip.define_alias(key.replace('.',''), cmd)
 
-    # mglob combines 'find', recursion, exclusion... '%mglob?' to learn more
-    ip.load("IPython.external.mglob")
-
     # win32 is crippled w/o cygwin, try to help it a little bit
     if sys.platform == 'win32':
         if 'cygwin' in os.environ['PATH'].lower():

IPython/quarantine/ipy_fsops.py

@@ -13,6 +13,14 b" commands (that e.g. don't understand / as path separator). These can"
 do some useful tricks on their own, though (like use 'mglob' patterns).
 
 Not to be confused with ipipe commands (ils etc.) that also start with i.
+
+QUARANTINE, NEEDS UPDATING TO THE NEW IPYTHON API TO WORK
+
+this depends on mglob that used to be in externals,
+if this code is updated to run again with current IPython, you may need to
+reintroduce that file back. In doing so, look for the possibility of achieving
+the same effect only with the standard library (which may have improved by now,
+since we currently depend on Python 2.6).
 """
 
 from IPython.core import ipapi

docs/source/interactive/shell.txt

@@ -138,17 +138,6 b" If you want to store the alias so that it will always be available, do '%store p"
  Alias stored: psftp (0, 'c:\\opt\\PuTTY\\psftp.exe')
  ...
 
-mglob
------
-
-Provide the magic function %mglob, which makes it easier (than the 'find' command) to collect (possibly recursive) file lists. Examples::
-
- [c:/ipython]|9> mglob *.py
- [c:/ipython]|10> mglob *.py rec:*.txt
- [c:/ipython]|19> workfiles = %mglob !.svn/ !.hg/ !*_Data/ !*.bak rec:.
-
-Note that the first 2 calls will put the file list in result history (_, _9, _10), and the last one will assign it to 'workfiles'.
-
 
 Prompt customization
 ====================