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