diff --git a/IPython/core/iplib.py b/IPython/core/iplib.py index cbcce45..20eaaa4 100644 --- a/IPython/core/iplib.py +++ b/IPython/core/iplib.py @@ -48,7 +48,7 @@ from IPython.core.component import Component from IPython.core.usage import interactive_usage, default_banner from IPython.core.error import TryNext, UsageError -from IPython.extensions import pickleshare +from IPython.utils import pickleshare from IPython.external.Itpl import ItplNS from IPython.lib.backgroundjobs import BackgroundJobManager from IPython.utils.ipstruct import Struct diff --git a/IPython/core/tests/test_magic.py b/IPython/core/tests/test_magic.py index f2eb516..9e39be4 100644 --- a/IPython/core/tests/test_magic.py +++ b/IPython/core/tests/test_magic.py @@ -79,7 +79,7 @@ def test_shist(): # Simple tests of ShadowHist class - test generator. import os, shutil, tempfile - from IPython.extensions import pickleshare + from IPython.utils import pickleshare from IPython.core.history import ShadowHist tfile = tempfile.mktemp('','tmp-ipython-') diff --git a/IPython/extensions/PhysicalQInput.py b/IPython/deathrow/PhysicalQInput.py similarity index 100% rename from IPython/extensions/PhysicalQInput.py rename to IPython/deathrow/PhysicalQInput.py diff --git a/IPython/extensions/PhysicalQInteractive.py b/IPython/deathrow/PhysicalQInteractive.py similarity index 100% rename from IPython/extensions/PhysicalQInteractive.py rename to IPython/deathrow/PhysicalQInteractive.py diff --git a/IPython/extensions/astyle.py b/IPython/deathrow/astyle.py similarity index 100% rename from IPython/extensions/astyle.py rename to IPython/deathrow/astyle.py diff --git a/IPython/extensions/ibrowse.py b/IPython/deathrow/ibrowse.py similarity index 100% rename from IPython/extensions/ibrowse.py rename to IPython/deathrow/ibrowse.py diff --git a/IPython/extensions/igrid.py b/IPython/deathrow/igrid.py similarity index 100% rename from IPython/extensions/igrid.py rename to IPython/deathrow/igrid.py diff --git a/IPython/extensions/igrid_help.css b/IPython/deathrow/igrid_help.css similarity index 100% rename from IPython/extensions/igrid_help.css rename to IPython/deathrow/igrid_help.css diff --git a/IPython/extensions/igrid_help.html b/IPython/deathrow/igrid_help.html similarity index 100% rename from IPython/extensions/igrid_help.html rename to IPython/deathrow/igrid_help.html diff --git a/IPython/extensions/ipipe.py b/IPython/deathrow/ipipe.py similarity index 100% rename from IPython/extensions/ipipe.py rename to IPython/deathrow/ipipe.py diff --git a/IPython/extensions/ipy_constants.py b/IPython/deathrow/ipy_constants.py similarity index 100% rename from IPython/extensions/ipy_constants.py rename to IPython/deathrow/ipy_constants.py diff --git a/IPython/extensions/ipy_defaults.py b/IPython/deathrow/ipy_defaults.py similarity index 100% rename from IPython/extensions/ipy_defaults.py rename to IPython/deathrow/ipy_defaults.py diff --git a/IPython/extensions/ipy_kitcfg.py b/IPython/deathrow/ipy_kitcfg.py similarity index 100% rename from IPython/extensions/ipy_kitcfg.py rename to IPython/deathrow/ipy_kitcfg.py diff --git a/IPython/extensions/ipy_legacy.py b/IPython/deathrow/ipy_legacy.py similarity index 100% rename from IPython/extensions/ipy_legacy.py rename to IPython/deathrow/ipy_legacy.py diff --git a/IPython/extensions/ipy_p4.py b/IPython/deathrow/ipy_p4.py similarity index 100% rename from IPython/extensions/ipy_p4.py rename to IPython/deathrow/ipy_p4.py diff --git a/IPython/extensions/ipy_profile_none.py b/IPython/deathrow/ipy_profile_none.py similarity index 100% rename from IPython/extensions/ipy_profile_none.py rename to IPython/deathrow/ipy_profile_none.py diff --git a/IPython/extensions/ipy_profile_numpy.py b/IPython/deathrow/ipy_profile_numpy.py similarity index 100% rename from IPython/extensions/ipy_profile_numpy.py rename to IPython/deathrow/ipy_profile_numpy.py diff --git a/IPython/extensions/ipy_profile_scipy.py b/IPython/deathrow/ipy_profile_scipy.py similarity index 100% rename from IPython/extensions/ipy_profile_scipy.py rename to IPython/deathrow/ipy_profile_scipy.py diff --git a/IPython/extensions/ipy_profile_sh.py b/IPython/deathrow/ipy_profile_sh.py similarity index 100% rename from IPython/extensions/ipy_profile_sh.py rename to IPython/deathrow/ipy_profile_sh.py diff --git a/IPython/extensions/ipy_profile_zope.py b/IPython/deathrow/ipy_profile_zope.py similarity index 100% rename from IPython/extensions/ipy_profile_zope.py rename to IPython/deathrow/ipy_profile_zope.py diff --git a/IPython/extensions/ipy_traits_completer.py b/IPython/deathrow/ipy_traits_completer.py similarity index 100% rename from IPython/extensions/ipy_traits_completer.py rename to IPython/deathrow/ipy_traits_completer.py diff --git a/IPython/extensions/ipy_vimserver.py b/IPython/deathrow/ipy_vimserver.py similarity index 100% rename from IPython/extensions/ipy_vimserver.py rename to IPython/deathrow/ipy_vimserver.py diff --git a/IPython/extensions/numeric_formats.py b/IPython/deathrow/numeric_formats.py similarity index 100% rename from IPython/extensions/numeric_formats.py rename to IPython/deathrow/numeric_formats.py diff --git a/IPython/extensions/scitedirector.py b/IPython/deathrow/scitedirector.py similarity index 100% rename from IPython/extensions/scitedirector.py rename to IPython/deathrow/scitedirector.py diff --git a/IPython/extensions/InterpreterExec.py b/IPython/quarantine/InterpreterExec.py similarity index 100% rename from IPython/extensions/InterpreterExec.py rename to IPython/quarantine/InterpreterExec.py diff --git a/IPython/extensions/InterpreterPasteInput.py b/IPython/quarantine/InterpreterPasteInput.py similarity index 100% rename from IPython/extensions/InterpreterPasteInput.py rename to IPython/quarantine/InterpreterPasteInput.py diff --git a/IPython/extensions/envpersist.py b/IPython/quarantine/envpersist.py similarity index 100% rename from IPython/extensions/envpersist.py rename to IPython/quarantine/envpersist.py diff --git a/IPython/extensions/ext_rescapture.py b/IPython/quarantine/ext_rescapture.py similarity index 100% rename from IPython/extensions/ext_rescapture.py rename to IPython/quarantine/ext_rescapture.py diff --git a/IPython/extensions/ipy_app_completers.py b/IPython/quarantine/ipy_app_completers.py similarity index 100% rename from IPython/extensions/ipy_app_completers.py rename to IPython/quarantine/ipy_app_completers.py diff --git a/IPython/extensions/ipy_autoreload.py b/IPython/quarantine/ipy_autoreload.py similarity index 100% rename from IPython/extensions/ipy_autoreload.py rename to IPython/quarantine/ipy_autoreload.py diff --git a/IPython/extensions/ipy_bzr.py b/IPython/quarantine/ipy_bzr.py similarity index 100% rename from IPython/extensions/ipy_bzr.py rename to IPython/quarantine/ipy_bzr.py diff --git a/IPython/extensions/ipy_completers.py b/IPython/quarantine/ipy_completers.py similarity index 100% rename from IPython/extensions/ipy_completers.py rename to IPython/quarantine/ipy_completers.py diff --git a/IPython/extensions/ipy_editors.py b/IPython/quarantine/ipy_editors.py similarity index 100% rename from IPython/extensions/ipy_editors.py rename to IPython/quarantine/ipy_editors.py diff --git a/IPython/extensions/ipy_exportdb.py b/IPython/quarantine/ipy_exportdb.py similarity index 100% rename from IPython/extensions/ipy_exportdb.py rename to IPython/quarantine/ipy_exportdb.py diff --git a/IPython/extensions/ipy_extutil.py b/IPython/quarantine/ipy_extutil.py similarity index 100% rename from IPython/extensions/ipy_extutil.py rename to IPython/quarantine/ipy_extutil.py diff --git a/IPython/extensions/ipy_fsops.py b/IPython/quarantine/ipy_fsops.py similarity index 100% rename from IPython/extensions/ipy_fsops.py rename to IPython/quarantine/ipy_fsops.py diff --git a/IPython/extensions/ipy_gnuglobal.py b/IPython/quarantine/ipy_gnuglobal.py similarity index 100% rename from IPython/extensions/ipy_gnuglobal.py rename to IPython/quarantine/ipy_gnuglobal.py diff --git a/IPython/extensions/ipy_greedycompleter.py b/IPython/quarantine/ipy_greedycompleter.py similarity index 100% rename from IPython/extensions/ipy_greedycompleter.py rename to IPython/quarantine/ipy_greedycompleter.py diff --git a/IPython/extensions/ipy_jot.py b/IPython/quarantine/ipy_jot.py similarity index 100% rename from IPython/extensions/ipy_jot.py rename to IPython/quarantine/ipy_jot.py diff --git a/IPython/extensions/ipy_lookfor.py b/IPython/quarantine/ipy_lookfor.py similarity index 100% rename from IPython/extensions/ipy_lookfor.py rename to IPython/quarantine/ipy_lookfor.py diff --git a/IPython/extensions/ipy_pretty.py b/IPython/quarantine/ipy_pretty.py similarity index 100% rename from IPython/extensions/ipy_pretty.py rename to IPython/quarantine/ipy_pretty.py diff --git a/IPython/extensions/ipy_profile_doctest.py b/IPython/quarantine/ipy_profile_doctest.py similarity index 100% rename from IPython/extensions/ipy_profile_doctest.py rename to IPython/quarantine/ipy_profile_doctest.py diff --git a/IPython/extensions/ipy_pydb.py b/IPython/quarantine/ipy_pydb.py similarity index 100% rename from IPython/extensions/ipy_pydb.py rename to IPython/quarantine/ipy_pydb.py diff --git a/IPython/extensions/ipy_rehashdir.py b/IPython/quarantine/ipy_rehashdir.py similarity index 100% rename from IPython/extensions/ipy_rehashdir.py rename to IPython/quarantine/ipy_rehashdir.py diff --git a/IPython/extensions/ipy_render.py b/IPython/quarantine/ipy_render.py similarity index 100% rename from IPython/extensions/ipy_render.py rename to IPython/quarantine/ipy_render.py diff --git a/IPython/extensions/ipy_server.py b/IPython/quarantine/ipy_server.py similarity index 100% rename from IPython/extensions/ipy_server.py rename to IPython/quarantine/ipy_server.py diff --git a/IPython/extensions/ipy_signals.py b/IPython/quarantine/ipy_signals.py similarity index 100% rename from IPython/extensions/ipy_signals.py rename to IPython/quarantine/ipy_signals.py diff --git a/IPython/extensions/ipy_stock_completers.py b/IPython/quarantine/ipy_stock_completers.py similarity index 100% rename from IPython/extensions/ipy_stock_completers.py rename to IPython/quarantine/ipy_stock_completers.py diff --git a/IPython/extensions/ipy_synchronize_with.py b/IPython/quarantine/ipy_synchronize_with.py similarity index 100% rename from IPython/extensions/ipy_synchronize_with.py rename to IPython/quarantine/ipy_synchronize_with.py diff --git a/IPython/extensions/ipy_system_conf.py b/IPython/quarantine/ipy_system_conf.py similarity index 100% rename from IPython/extensions/ipy_system_conf.py rename to IPython/quarantine/ipy_system_conf.py diff --git a/IPython/extensions/ipy_which.py b/IPython/quarantine/ipy_which.py similarity index 100% rename from IPython/extensions/ipy_which.py rename to IPython/quarantine/ipy_which.py diff --git a/IPython/extensions/ipy_winpdb.py b/IPython/quarantine/ipy_winpdb.py similarity index 100% rename from IPython/extensions/ipy_winpdb.py rename to IPython/quarantine/ipy_winpdb.py diff --git a/IPython/extensions/ipy_workdir.py b/IPython/quarantine/ipy_workdir.py similarity index 100% rename from IPython/extensions/ipy_workdir.py rename to IPython/quarantine/ipy_workdir.py diff --git a/IPython/extensions/jobctrl.py b/IPython/quarantine/jobctrl.py similarity index 100% rename from IPython/extensions/jobctrl.py rename to IPython/quarantine/jobctrl.py diff --git a/IPython/extensions/ledit.py b/IPython/quarantine/ledit.py similarity index 100% rename from IPython/extensions/ledit.py rename to IPython/quarantine/ledit.py diff --git a/IPython/extensions/pspersistence.py b/IPython/quarantine/pspersistence.py similarity index 100% rename from IPython/extensions/pspersistence.py rename to IPython/quarantine/pspersistence.py diff --git a/IPython/extensions/win32clip.py b/IPython/quarantine/win32clip.py similarity index 100% rename from IPython/extensions/win32clip.py rename to IPython/quarantine/win32clip.py diff --git a/IPython/extensions/pickleshare.py b/IPython/utils/pickleshare.py similarity index 100% rename from IPython/extensions/pickleshare.py rename to IPython/utils/pickleshare.py