##// END OF EJS Templates
Small fix to sys.argv, match python's default behavior.
fperez -
Show More
@@ -27,10 +27,10 b' IPython tries to:'
27
27
28 IPython requires Python 2.3 or newer.
28 IPython requires Python 2.3 or newer.
29
29
30 $Id: __init__.py 1314 2006-05-19 18:24:14Z fperez $"""
30 $Id: __init__.py 1328 2006-05-25 07:47:56Z fperez $"""
31
31
32 #*****************************************************************************
32 #*****************************************************************************
33 # Copyright (C) 2001-2004 Fernando Perez. <fperez@colorado.edu>
33 # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu>
34 #
34 #
35 # Distributed under the terms of the BSD License. The full license is in
35 # Distributed under the terms of the BSD License. The full license is in
36 # the file COPYING, distributed as part of this software.
36 # the file COPYING, distributed as part of this software.
@@ -40,14 +40,13 b' $Id: __init__.py 1314 2006-05-19 18:24:14Z fperez $"""'
40 import sys
40 import sys
41
41
42 if sys.version[0:3] < '2.3':
42 if sys.version[0:3] < '2.3':
43 raise ImportError, 'Python Version 2.3 or above is required.'
43 raise ImportError('Python Version 2.3 or above is required for IPython.')
44
44
45 # Make it easy to import extensions - they are always directly on pythonpath.
45 # Make it easy to import extensions - they are always directly on pythonpath.
46 # Therefore, non-IPython modules can be added to Extensions directory
46 # Therefore, non-IPython modules can be added to Extensions directory
47
48 import os
47 import os
49 sys.path.append(os.path.dirname(__file__) + "/Extensions")
48 sys.path.append(os.path.dirname(__file__) + "/Extensions")
50
49
51 # Define what gets imported with a 'from IPython import *'
50 # Define what gets imported with a 'from IPython import *'
52 __all__ = ['deep_reload','genutils','ipstruct','ultraTB','DPyGetOpt',
51 __all__ = ['deep_reload','genutils','ipstruct','ultraTB','DPyGetOpt',
53 'Itpl','hooks','ConfigLoader','OutputTrap','Release','Shell',
52 'Itpl','hooks','ConfigLoader','OutputTrap','Release','Shell',
@@ -6,7 +6,7 b' Requires Python 2.1 or better.'
6
6
7 This file contains the main make_IPython() starter function.
7 This file contains the main make_IPython() starter function.
8
8
9 $Id: ipmaker.py 1324 2006-05-24 20:25:11Z fperez $"""
9 $Id: ipmaker.py 1328 2006-05-25 07:47:56Z fperez $"""
10
10
11 #*****************************************************************************
11 #*****************************************************************************
12 # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu>
12 # Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu>
@@ -329,6 +329,11 b" object? -> Details about 'object'. ?object also works, ?? prints more."
329 mutex_opts(opts,[qw('log logfile'),qw('rcfile profile'),
329 mutex_opts(opts,[qw('log logfile'),qw('rcfile profile'),
330 qw('classic profile'),qw('classic rcfile')])
330 qw('classic profile'),qw('classic rcfile')])
331
331
332 # Fix up sys.argv to omit the ipython call, for consistency with how
333 # Python itself operates (the inconsistency can break user scripts which
334 # rely on the Python behavior when run under ipython).
335 sys.argv[:] = sys.argv[1:]
336
332 #---------------------------------------------------------------------------
337 #---------------------------------------------------------------------------
333 # Log replay
338 # Log replay
334
339
@@ -1,4 +1,9 b''
1 2006-05-24 Fernando Perez <Fernando.Perez@colorado.edu>
1 2006-05-25 Fernando Perez <Fernando.Perez@colorado.edu>
2
3 * IPython/ipmaker.py (make_IPython): remove the ipython call path
4 from sys.argv, to be 100% consistent with how Python itself works
5 (as seen for example with python -i file.py). After a bug report
6 by Jeffrey Collins.
2
7
3 * IPython/Shell.py (MatplotlibShellBase._matplotlib_config): Fix
8 * IPython/Shell.py (MatplotlibShellBase._matplotlib_config): Fix
4 nasty bug which was preventing custom namespaces with -pylab,
9 nasty bug which was preventing custom namespaces with -pylab,
General Comments 0
You need to be logged in to leave comments. Login now