move path to external

IPython/Extensions/ipy_fsops.py

@@ -20,7 +20,7 b' ip = IPython.ipapi.get()'
 
 import shutil,os,shlex
 from IPython.external import mglob
-from IPython.Extensions.path import path
+from IPython.external.path import path
 from IPython.ipapi import UsageError
 
 def parse_args(args):
@@ -138,7 +138,7 b' def collect(ip,arg):'
     
     Without args, try to open ~/_ipython/collect dir (in win32 at least).
     """
-    from path import path
+    from IPython.external.path import path
     basedir = path(ip.options.ipythondir + '/collect')
     try:    
         fs = mglob.expand(arg.split(None,1)[1])

IPython/Extensions/ipy_profile_sh.py

@@ -25,7 +25,7 b' def main():'
     # Jason Orendorff's path class is handy to have in user namespace
     # if you are doing shell-like stuff
     try:
-        ip.ex("from path import path" )
+        ip.ex("from IPython.external.path import path" )
     except ImportError:
         pass
     

IPython/Extensions/pickleshare.py

@@ -33,7 +33,7 b' License: MIT open source license.'
 
 """
 
-from path import path as Path
+from IPython.external.path import path as Path
 import os,stat,time
 import cPickle as pickle
 import UserDict

IPython/genutils.py

@@ -5,7 +5,7 b' General purpose utilities.'
 This is a grab-bag of stuff I find useful in most programs I write. Some of
 these things are also convenient when working at the command line.
 
-$Id: genutils.py 2955 2008-01-19 15:22:59Z vivainio $"""
+$Id: genutils.py 2998 2008-01-31 10:06:04Z vivainio $"""
 
 #*****************************************************************************
 #       Copyright (C) 2001-2006 Fernando Perez. <[e-mail]>
@@ -39,7 +39,7 b' from IPython.Itpl import Itpl,itpl,printpl'
 from IPython import DPyGetOpt, platutils
 from IPython.generics import result_display
 import IPython.ipapi
-from path import path
+from IPython.external.path import path
 if os.name == "nt":
     from IPython.winconsole import get_console_size
 

IPython/hooks.py

@@ -32,7 +32,7 b" ip.set_hook('editor', calljed)"
 You can then enable the functionality by doing 'import myiphooks'
 somewhere in your configuration files or ipython command line.
 
-$Id: hooks.py 2955 2008-01-19 15:22:59Z vivainio $"""
+$Id: hooks.py 2998 2008-01-31 10:06:04Z vivainio $"""
 
 #*****************************************************************************
 #       Copyright (C) 2005 Fernando Perez. <[e-mail]>
@@ -222,10 +222,16 b' def shell_hook(self,cmd):'
 
     shell(cmd, header=self.rc.system_header, verbose=self.rc.system_verbose)
 
-
 def show_in_pager(self,s):
     """ Run a string through pager """
     # raising TryNext here will use the default paging functionality
     raise ipapi.TryNext
+
+def pre_command_hook(self,cmd):
+    """" Executed before starting to execute a command """
+    return None
+
+def post_command_hook(self,cmd):
+    """ Executed after executing a command """
     
 

IPython/upgrade_dir.py

@@ -7,12 +7,9 b' new and unedited files.'
 To be used by "upgrade" feature.
 """
 try:
-    from IPython.Extensions.path import path
+    from IPython.external.path import path
 except ImportError:
-    try:
-        from Extensions.path import path
-    except ImportError:
-        from path import path
+    from path import path
 
 import md5,pickle
 

test/runtests.py

@@ -5,7 +5,7 b' or through ipython command line "ipython runtests.py".'
 
 """
 
-from path import path
+from IPython.external.path import path
 import pprint,os
 import IPython.ipapi
 ip = IPython.ipapi.get()
@@ -28,4 +28,4 b' def main():'
     os.chdir(startdir)
     pprint.pprint(results)
         
-main()
  No newline at end of file
+main()

tools/check_sources.py

@@ -1,4 +1,4 b''
-from path import path
+from IPython.external.path import path
 fs = path('..').walkfiles('*.py')
 
 for f in fs: