Changeset 2998
- Timestamp:
- 01/31/08 04:06:04 (10 months ago)
- Files:
-
- ipython/trunk/IPython/Extensions/ipy_fsops.py (modified) (2 diffs)
- ipython/trunk/IPython/Extensions/ipy_profile_sh.py (modified) (1 diff)
- ipython/trunk/IPython/Extensions/path.py (deleted)
- ipython/trunk/IPython/Extensions/pickleshare.py (modified) (1 diff)
- ipython/trunk/IPython/genutils.py (modified) (1 diff)
- ipython/trunk/IPython/hooks.py (modified) (1 diff)
- ipython/trunk/IPython/upgrade_dir.py (modified) (1 diff)
- ipython/trunk/test/runtests.py (modified) (1 diff)
- ipython/trunk/tools/check_sources.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
ipython/trunk/IPython/Extensions/ipy_fsops.py
r2906 r2998 21 21 import shutil,os,shlex 22 22 from IPython.external import mglob 23 from IPython. Extensions.path import path23 from IPython.external.path import path 24 24 from IPython.ipapi import UsageError 25 25 … … 139 139 Without args, try to open ~/_ipython/collect dir (in win32 at least). 140 140 """ 141 from path import path141 from IPython.external.path import path 142 142 basedir = path(ip.options.ipythondir + '/collect') 143 143 try: ipython/trunk/IPython/Extensions/ipy_profile_sh.py
r2925 r2998 26 26 # if you are doing shell-like stuff 27 27 try: 28 ip.ex("from path import path" )28 ip.ex("from IPython.external.path import path" ) 29 29 except ImportError: 30 30 pass ipython/trunk/IPython/Extensions/pickleshare.py
r2685 r2998 34 34 """ 35 35 36 from path import path as Path36 from IPython.external.path import path as Path 37 37 import os,stat,time 38 38 import cPickle as pickle ipython/trunk/IPython/genutils.py
r2955 r2998 40 40 from IPython.generics import result_display 41 41 import IPython.ipapi 42 from path import path42 from IPython.external.path import path 43 43 if os.name == "nt": 44 44 from IPython.winconsole import get_console_size ipython/trunk/IPython/hooks.py
r2955 r2998 223 223 shell(cmd, header=self.rc.system_header, verbose=self.rc.system_verbose) 224 224 225 226 225 def show_in_pager(self,s): 227 226 """ Run a string through pager """ 228 227 # raising TryNext here will use the default paging functionality 229 228 raise ipapi.TryNext 230 231 229 230 def pre_command_hook(self,cmd): 231 """" Executed before starting to execute a command """ 232 return None 233 234 def post_command_hook(self,cmd): 235 """ Executed after executing a command """ 236 237 ipython/trunk/IPython/upgrade_dir.py
r2302 r2998 8 8 """ 9 9 try: 10 from IPython. Extensions.path import path10 from IPython.external.path import path 11 11 except ImportError: 12 try: 13 from Extensions.path import path 14 except ImportError: 15 from path import path 12 from path import path 16 13 17 14 import md5,pickle ipython/trunk/test/runtests.py
r1134 r2998 6 6 """ 7 7 8 from path import path8 from IPython.external.path import path 9 9 import pprint,os 10 10 import IPython.ipapi ipython/trunk/tools/check_sources.py
r2010 r2998 1 from path import path1 from IPython.external.path import path 2 2 fs = path('..').walkfiles('*.py') 3 3
