diff --git a/IPython/deathrow/oldfrontend/asyncfrontendbase.py b/IPython/deathrow/oldfrontend/asyncfrontendbase.py index 649ff21..ba912aa 100644 --- a/IPython/deathrow/oldfrontend/asyncfrontendbase.py +++ b/IPython/deathrow/oldfrontend/asyncfrontendbase.py @@ -22,13 +22,13 @@ 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 @@ 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) diff --git a/IPython/deathrow/oldfrontend/cocoa/cocoa_frontend.py b/IPython/deathrow/oldfrontend/cocoa/cocoa_frontend.py index ca1e058..a7ee199 100644 --- a/IPython/deathrow/oldfrontend/cocoa/cocoa_frontend.py +++ b/IPython/deathrow/oldfrontend/cocoa/cocoa_frontend.py @@ -26,7 +26,7 @@ __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 @@ 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()""" diff --git a/IPython/deathrow/oldfrontend/frontendbase.py b/IPython/deathrow/oldfrontend/frontendbase.py index 3dc9f40..da02949 100644 --- a/IPython/deathrow/oldfrontend/frontendbase.py +++ b/IPython/deathrow/oldfrontend/frontendbase.py @@ -22,7 +22,7 @@ __docformat__ = "restructuredtext en" #------------------------------------------------------------------------------- import string import codeop -from IPython.external import guid +import uuid from IPython.frontend.zopeinterface import ( @@ -242,7 +242,7 @@ class FrontEndBase(object): raise Exception("Block is not compilable") if(blockID == None): - blockID = guid.generate() + blockID = uuid.uuid4() try: result = self.shell.execute(block)