diff --git a/IPython/UserConfig/ipythonrc-scipy b/IPython/UserConfig/ipythonrc-scipy index 76d55f2..df351df 100644 --- a/IPython/UserConfig/ipythonrc-scipy +++ b/IPython/UserConfig/ipythonrc-scipy @@ -23,21 +23,13 @@ include ipythonrc # import ... -# Load SciPy by itself so that 'help scipy' works -import_mod scipy +# Load Numpy an SciPy by themselves so that 'help' works on them +import_mod numpy scipy # from ... import ... import_some # Now we load all of SciPy # from ... import * -import_all scipy IPython.numutils - -# code -execute print 'Welcome to the SciPy Scientific Computing Environment.' -execute scipy.alter_numeric() - -# File with alternate printer system for Numeric Arrays. -# Files in the 'Extensions' directory will be found by IPython automatically -# (otherwise give the explicit path): -execfile Extensions/numeric_formats.py +import_all numpy +import_all scipy diff --git a/doc/ChangeLog b/doc/ChangeLog index 380f628..9222adf 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,8 @@ 2006-10-28 Fernando Perez + * IPython/UserConfig/ipythonrc-scipy: minor clenaups to remove old + Numeric leftovers. + * ipython.el (py-execute-region): apply Stefan's patch to fix garbled results if the python shell hasn't been previously started.