##// END OF EJS Templates
Moved path to extensions - pickleshare failed because it imported...
vivainio -
Show More
1 NO CONTENT: file renamed from IPython/path.py to IPython/Extensions/path.py
@@ -27,7 +27,7 b' IPython tries to:'
27 27
28 28 IPython requires Python 2.2 or newer.
29 29
30 $Id: __init__.py 1099 2006-01-29 21:05:57Z vivainio $"""
30 $Id: __init__.py 1110 2006-01-30 20:43:30Z vivainio $"""
31 31
32 32 #*****************************************************************************
33 33 # Copyright (C) 2001-2004 Fernando Perez. <fperez@colorado.edu>
@@ -38,14 +38,21 b' $Id: __init__.py 1099 2006-01-29 21:05:57Z vivainio $"""'
38 38
39 39 # Enforce proper version requirements
40 40 import sys
41
41 42 if sys.version[0:3] < '2.3':
42 43 raise ImportError, 'Python Version 2.3 or above is required.'
43 44
45 # Make it easy to import extensions - they are always directly on pythonpath.
46 # Therefore, non-IPython modules can be added to Extensions directory
47
48 import os
49 sys.path.append(os.path.dirname(__file__) + "/Extensions")
50
44 51 # Define what gets imported with a 'from IPython import *'
45 52 __all__ = ['deep_reload','genutils','ipstruct','ultraTB','DPyGetOpt',
46 53 'Itpl','hooks','ConfigLoader','OutputTrap','Release','Shell',
47 54 'platutils','platutils_win32','platutils_posix','platutils_dummy',
48 'ipapi','path','rlineimpl']
55 'ipapi','rlineimpl']
49 56
50 57 # Load __all__ in IPython namespace so that a simple 'import IPython' gives
51 58 # access to them via IPython.<name>
@@ -5,7 +5,7 b' General purpose utilities.'
5 5 This is a grab-bag of stuff I find useful in most programs I write. Some of
6 6 these things are also convenient when working at the command line.
7 7
8 $Id: genutils.py 1100 2006-01-29 21:27:16Z vivainio $"""
8 $Id: genutils.py 1110 2006-01-30 20:43:30Z vivainio $"""
9 9
10 10 #*****************************************************************************
11 11 # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu>
@@ -36,7 +36,7 b' import types'
36 36 # Other IPython utilities
37 37 from IPython.Itpl import Itpl,itpl,printpl
38 38 from IPython import DPyGetOpt
39 from IPython.path import path
39 from path import path
40 40 if os.name == "nt":
41 41 from IPython.winconsole import get_console_size
42 42
@@ -13,6 +13,10 b''
13 13
14 14 * aliases can now be %store'd
15 15
16 * path.py move to Extensions so that pickleshare does not need
17 IPython-specific import. Extensions added to pythonpath right
18 at __init__.
19
16 20 2006-01-29 Fernando Perez <Fernando.Perez@colorado.edu>
17 21
18 22 * IPython/iplib.py (interact): Fix that we were not catching
General Comments 0
You need to be logged in to leave comments. Login now