##// END OF EJS Templates
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ...
This is a manual merge of certain things in the ipython1-dev branch, revision 46, into the main ipython branch. This is not a true merge in the formal sense because all history is not coming over with the files. For a detailed history of the added files, please see the ipython1-dev branch or the svn repository on scipy.org that ipython1-dev came from. More specifically, here is what I have done in this commit: 1) Moved the following by hand ipython1.config -> IPython.config ipython1.kernel -> IPython.kernel ipython1.external -> IPython.external ipython1.core -> IPython.kernel.core ipython1.testutils -> IPython.testing ipython1.tools -> IPython.tools 2) Moved IPython.tools.guid -> IPython1.external.guid 3) Renamed: ipython1 -> IPython IPython.core -> IPython.kernel.core IPython.testutils -> IPython.testing 4) Then did a "bzr add" for all the new stuff. That is all folks!

File last commit:

r723:21a6130e
r1234:52b55407
Show More
ipy_system_conf.py
24 lines | 528 B | text/x-python | PythonLexer
""" System wide configuration file for IPython.
This will be imported by ipython for all users.
After this ipy_user_conf.py is imported, user specific configuration
should reside there.
"""
import IPython.ipapi
ip = IPython.ipapi.get()
# add system wide configuration information, import extensions etc. here.
# nothing here is essential
import sys
import ext_rescapture # var = !ls and var = %magic
import pspersistence # %store magic
import clearcmd # %clear
import ipy_stock_completers
ip.load('IPython.history')