Merge pull request #1199 from tomspur/my_reduce_external

* Removes guid from external, because we now use stdlib uuid.
* Remove some miscellaneous unused imports
* The only remaining guid usage was in deathrow, and has been replaced with uuids, but is untested.

IPython/core/interactiveshell.py

@@ -64,7 +64,6 b' from IPython.core.prefilter import PrefilterManager, ESC_MAGIC'
 from IPython.core.profiledir import ProfileDir
 from IPython.core.pylabtools import pylab_activate
 from IPython.core.prompts import PromptManager
-from IPython.external.Itpl import ItplNS
 from IPython.utils import PyColorize
 from IPython.utils import io
 from IPython.utils import py3compat

IPython/core/tests/test_application.py

@@ -5,10 +5,10 b' import os'
 import tempfile
 
 from IPython.core.application import BaseIPythonApplication
-from IPython.testing import decorators as testdec
+from IPython.testing import decorators as dec
 from IPython.utils import py3compat
 
[e-mail]_unicode_paths
[e-mail]_unicode_paths
 def test_unicode_cwd():
     """Check that IPython starts with non-ascii characters in the path."""
     wd = tempfile.mkdtemp(suffix=u"€")
@@ -25,7 +25,7 b' def test_unicode_cwd():'
     finally:
         os.chdir(old_wd)
 
[e-mail]_unicode_paths
[e-mail]_unicode_paths
 def test_unicode_ipdir():
     """Check that IPython starts with non-ascii characters in the IP dir."""
     ipdir = tempfile.mkdtemp(suffix=u"€")

IPython/core/tests/test_completerlib.py

@@ -19,8 +19,6 b' import nose.tools as nt'
 from nose import SkipTest
 
 from IPython.core.completerlib import magic_run_completer
-from IPython.testing import decorators as dec
-from IPython.testing import tools as tt
 from IPython.utils import py3compat
 
 

IPython/core/tests/test_handlers.py

@@ -9,7 +9,6 b' import nose.tools as nt'
 
 # our own packages
 from IPython.core import autocall
-from IPython.testing import decorators as dec
 from IPython.testing import tools as tt
 from IPython.testing.globalipapp import get_ipython
 from IPython.utils import py3compat

IPython/core/tests/test_interactiveshell.py

@@ -28,7 +28,6 b' from os.path import join'
 import sys
 from StringIO import StringIO
 
-from IPython.testing import decorators as dec
 from IPython.utils import io
 
 #-----------------------------------------------------------------------------

IPython/core/tests/test_iplib.py

@@ -13,7 +13,6 b' import tempfile'
 import nose.tools as nt
 
 # our own packages
-from IPython.testing import decorators as dec
 from IPython.testing.globalipapp import get_ipython
 from IPython.utils import py3compat
 

IPython/core/tests/test_magic_terminal.py

@@ -13,7 +13,6 b' from StringIO import StringIO'
 
 import nose.tools as nt
 
-from IPython.testing import decorators as dec
 from IPython.testing import tools as tt
 
 #-----------------------------------------------------------------------------

IPython/deathrow/oldfrontend/asyncfrontendbase.py

@@ -22,13 +22,13 b' from twisted.python.failure import Failure'
 from zope.interface import implements, classProvides
 
 # From IPython
-from IPython.external import guid
-
 from IPython.frontend.frontendbase import (FrontEndBase, IFrontEnd,
                                            IFrontEndFactory)
 from IPython.kernel.core.history import FrontEndHistory
 from IPython.kernel.engineservice import IEngineCore
 
+import uuid
+
 #-----------------------------------------------------------------------------
 # Classes and functions
 #-----------------------------------------------------------------------------
@@ -67,7 +67,7 b' class AsyncFrontEndBase(FrontEndBase):'
             return Failure(Exception("Block is not compilable"))
 
         if(blockID == None):
-            blockID = guid.generate()
+            blockID = uuid.uuid4()
 
         d = self.engine.execute(block)
         d.addCallback(self._add_history, block=block)

IPython/deathrow/oldfrontend/cocoa/cocoa_frontend.py

@@ -26,7 +26,7 b' __docformat__ = "restructuredtext en"'
 
 import sys
 import objc
-from IPython.external import guid
+import uuid
 
 from Foundation import NSObject, NSMutableArray, NSMutableDictionary,\
                         NSLog, NSNotificationCenter, NSMakeRange,\
@@ -361,7 +361,7 b' class IPythonCocoaController(NSObject, AsyncFrontEndBase):'
 
     def next_block_ID(self):
 
-        return guid.generate()
+        return uuid.uuid4()
 
     def new_cell_block(self):
         """A new CellBlock at the end of self.textView.textStorage()"""

IPython/deathrow/oldfrontend/frontendbase.py

@@ -22,7 +22,7 b' __docformat__ = "restructuredtext en"'
 #-------------------------------------------------------------------------------
 import string
 import codeop
-from IPython.external import guid
+import uuid
 
 
 from IPython.frontend.zopeinterface import (
@@ -242,7 +242,7 b' class FrontEndBase(object):'
             raise Exception("Block is not compilable")
 
         if(blockID == None):
-            blockID = guid.generate()
+            blockID = uuid.uuid4()
 
         try:
             result = self.shell.execute(block)

IPython/deathrow/oldfrontend/tests/test_process.py

@@ -17,7 +17,7 b' from time import sleep'
 import sys
 
 from IPython.frontend.process import PipedProcess
-from IPython.testing import decorators as testdec
+from IPython.testing import decorators as dec
 
 
 def test_capture_out():
@@ -47,7 +47,7 b' def test_io():'
     assert result == test_string
 
 
[e-mail]_win32
[e-mail]_win32
 def test_kill():
     """ Check that we can kill a process, and its subprocess.
     """