try import path.py from several places, just in case

IPython/upgrade_dir.py

@@ -6,7 +6,14 b' new and unedited files.'
 
 To be used by "upgrade" feature.
 """
-from IPython.Extensions.path import path
+try:
+    from IPython.Extensions.path import path
+except ImportError:
+    try:
+	from Extensions.path import path
+    except ImportError:
+	from path import path
+	
 import md5,pickle
 
 def showdiff(old,new):

doc/ChangeLog

@@ -2,6 +2,9 b''
 
 	* Magic.py (magic_rehashx): Honor no_alias list earlier in 
         %rehashx, to avoid clobbering builtins in ipy_profile_sh.py
+	
+        * upgrade_dir.py: try import 'path' module a bit harder
+        (for %upgrade)A
 
 2006-06-03  Fernando Perez  <[e-mail]>