diff --git a/IPython/Extensions/igrid.py b/IPython/Extensions/igrid.py index d6f625d..007f3fe 100644 --- a/IPython/Extensions/igrid.py +++ b/IPython/Extensions/igrid.py @@ -9,6 +9,10 @@ try: sorted except NameError: from ipipe import sorted +try: + set +except: + from sets import Set as set __all__ = ["igrid"] diff --git a/IPython/Extensions/ipy_completers.py b/IPython/Extensions/ipy_completers.py index cc7f8bb..d7a4d7f 100644 --- a/IPython/Extensions/ipy_completers.py +++ b/IPython/Extensions/ipy_completers.py @@ -14,6 +14,11 @@ import inspect from time import time ip = IPython.ipapi.get() +try: + set +except: + from sets import Set as set + TIMEOUT_STORAGE = 3 #Time in seconds after which the rootmodules will be stored TIMEOUT_GIVEUP = 20 #Time in seconds after which we give up diff --git a/IPython/Extensions/ipy_traits_completer.py b/IPython/Extensions/ipy_traits_completer.py index 5220ea9..6d3e6f7 100644 --- a/IPython/Extensions/ipy_traits_completer.py +++ b/IPython/Extensions/ipy_traits_completer.py @@ -54,6 +54,10 @@ from enthought.traits import api as T # IPython imports from IPython.ipapi import TryNext, get as ipget from IPython.genutils import dir2 +try: + set +except: + from sets import Set as set ############################################################################# # Module constants diff --git a/IPython/genutils.py b/IPython/genutils.py index a0caf60..ec00c8a 100644 --- a/IPython/genutils.py +++ b/IPython/genutils.py @@ -5,7 +5,7 @@ General purpose utilities. This is a grab-bag of stuff I find useful in most programs I write. Some of these things are also convenient when working at the command line. -$Id: genutils.py 2888 2007-12-12 17:20:42Z vivainio $""" +$Id: genutils.py 2937 2008-01-16 15:25:59Z vivainio $""" #***************************************************************************** # Copyright (C) 2001-2006 Fernando Perez. @@ -42,6 +42,12 @@ from path import path if os.name == "nt": from IPython.winconsole import get_console_size +try: + set +except: + from sets import Set as set + + #**************************************************************************** # Exceptions class Error(Exception):