genutils.py => utils/genutils.py and updated imports and tests.

ellisonbg · ellisonbg · commit d5854c689db0 · 2009-07-01T19:49:32.000-07:00
diff --git a/IPython/Extensions/InterpreterExec.py b/IPython/Extensions/InterpreterExec.py
@@ -50,7 +50,7 @@ def prefilter_shell(self,line,continuation):
 
 # Provide pysh and further shell-oriented services
 import os,sys,shutil
-from IPython.genutils import system,shell,getoutput,getoutputerror
+from IPython.utils.genutils import system,shell,getoutput,getoutputerror
 
 # Short aliases for getting shell output as a string and a list
 sout = getoutput
diff --git a/IPython/Extensions/ext_rescapture.py b/IPython/Extensions/ext_rescapture.py
@@ -9,7 +9,7 @@
 """
 
 import IPython.ipapi
-from IPython.genutils import *
+from IPython.utils.genutils import *
 
 ip = IPython.ipapi.get()
 
diff --git a/IPython/Extensions/ipipe.py b/IPython/Extensions/ipipe.py
@@ -133,7 +133,7 @@ def sorted(iterator, key=None, reverse=False):
 from IPython.external import path
 
 try:
-    from IPython import genutils
+    from IPython.utils import genutils
     from IPython.utils import generics
 except ImportError:
     genutils = None
diff --git a/IPython/Extensions/ipy_greedycompleter.py b/IPython/Extensions/ipy_greedycompleter.py
@@ -11,7 +11,7 @@
 """
 from IPython import ipapi
 from IPython.utils import generics
-from IPython.genutils import dir2
+from IPython.utils.genutils import dir2
 
 def attr_matches(self, text):
     """Compute matches when text contains a dot.
diff --git a/IPython/Extensions/ipy_legacy.py b/IPython/Extensions/ipy_legacy.py
@@ -14,7 +14,7 @@
 
 import os,sys
 
-from IPython.genutils import *
+from IPython.utils.genutils import *
 
 # use rehashx
 
diff --git a/IPython/Extensions/ipy_pretty.py b/IPython/Extensions/ipy_pretty.py
@@ -17,7 +17,7 @@
 """
 
 import IPython.ipapi
-from IPython.genutils import Term
+from IPython.utils.genutils import Term
 
 from IPython.external import pretty
 
diff --git a/IPython/Extensions/ipy_profile_sh.py b/IPython/Extensions/ipy_profile_sh.py
@@ -156,9 +156,9 @@ def slash_prefilter_f(self,line):
     
     Removes the need for doing !./foo, !~/foo or !/bin/foo
     """
-    import IPython.genutils
+    from IPython.utils import genutils
     if re.match('(?:[.~]|/[a-zA-Z_0-9]+)/', line):
-        return "_ip.system(" + IPython.genutils.make_quoted_expr(line)+")"
+        return "_ip.system(" + genutils.make_quoted_expr(line)+")"
     raise ipapi.TryNext
 
 # XXX You do not need to understand the next function!
diff --git a/IPython/Extensions/ipy_pydb.py b/IPython/Extensions/ipy_pydb.py
@@ -1,6 +1,6 @@
 import inspect
 import IPython.ipapi
-from IPython.genutils import arg_split
+from IPython.utils.genutils import arg_split
 ip = IPython.ipapi.get()
 
 from IPython.core import debugger
diff --git a/IPython/Extensions/ipy_traits_completer.py b/IPython/Extensions/ipy_traits_completer.py
@@ -53,7 +53,7 @@
 
 # IPython imports
 from IPython.ipapi import TryNext, get as ipget
-from IPython.genutils import dir2
+from IPython.utils.genutils import dir2
 try:
     set
 except:
diff --git a/IPython/Extensions/jobctrl.py b/IPython/Extensions/jobctrl.py
@@ -45,7 +45,7 @@
 import os,shlex,sys,time
 import threading,Queue
 
-from IPython import genutils
+from IPython.utils import genutils
 
 import IPython.ipapi
 
diff --git a/IPython/Gnuplot2.py b/IPython/Gnuplot2.py
@@ -25,7 +25,7 @@
 import Gnuplot as Gnuplot_ori
 import Numeric
 
-from IPython.genutils import popkey,xsys
+from IPython.utils.genutils import popkey,xsys
 
 # needed by hardcopy():
 gp = Gnuplot_ori.gp
diff --git a/IPython/GnuplotInteractive.py b/IPython/GnuplotInteractive.py
@@ -16,7 +16,7 @@
            'gphelp']
 
 import IPython.GnuplotRuntime as GRun
-from IPython.genutils import page,warn
+from IPython.utils.genutils import page,warn
 
 # Set global names for interactive use
 Gnuplot  = GRun.Gnuplot
diff --git a/IPython/GnuplotRuntime.py b/IPython/GnuplotRuntime.py
@@ -53,7 +53,7 @@
            'pm3d_config','eps_fix_bbox']
 
 import os,tempfile,sys
-from IPython.genutils import getoutput
+from IPython.utils.genutils import getoutput
 
 #---------------------------------------------------------------------------
 # Notes on mouse support for Gnuplot.py
diff --git a/IPython/Magic.py b/IPython/Magic.py
@@ -50,7 +50,7 @@
 from IPython.PyColorize import Parser
 from IPython.ipstruct import Struct
 from IPython.macro import Macro
-from IPython.genutils import *
+from IPython.utils.genutils import *
 from IPython import platutils
 import IPython.utils.generics
 import IPython.ipapi
diff --git a/IPython/OInspect.py b/IPython/OInspect.py
@@ -28,7 +28,7 @@
 
 # IPython's own
 from IPython import PyColorize
-from IPython.genutils import page,indent,Term
+from IPython.utils.genutils import page,indent,Term
 from IPython.Itpl import itpl
 from IPython.wildcard import list_namespace
 from IPython.utils.coloransi import *
diff --git a/IPython/Prompts.py b/IPython/Prompts.py
@@ -28,7 +28,7 @@
 from IPython.macro import Macro
 import IPython.utils.generics
 
-from IPython.genutils import *
+from IPython.utils.genutils import *
 
 #****************************************************************************
 #Color schemes for Prompts.
diff --git a/IPython/Shell.py b/IPython/Shell.py
@@ -36,7 +36,7 @@
 import IPython
 from IPython import ultraTB, ipapi
 from IPython.Magic import Magic
-from IPython.genutils import Term,warn,error,flag_calls, ask_yes_no
+from IPython.utils.genutils import Term,warn,error,flag_calls, ask_yes_no
 from IPython.iplib import InteractiveShell
 from IPython.ipmaker import make_IPython
 from IPython.ipstruct import Struct
diff --git a/IPython/UserConfig/ipythonrc b/IPython/UserConfig/ipythonrc
@@ -504,9 +504,9 @@ import_mod
 
 # Example:
 
-# import_some IPython.genutils timing timings
+# import_some IPython.utils.genutils timing timings
 # will produce internally the statement
-# from IPython.genutils import timing, timings
+# from IPython.utils.genutils import timing, timings
 
 # timing() and timings() are two IPython utilities for timing the execution of
 # your own functions, which you may find useful.  Just commment out the above
diff --git a/IPython/config/api.py b/IPython/config/api.py
@@ -18,7 +18,7 @@
 import os
 from os.path import join as pjoin
 
-from IPython.genutils import get_home_dir, get_ipython_dir
+from IPython.utils.genutils import get_home_dir, get_ipython_dir
 from IPython.external.configobj import ConfigObj
 
 
diff --git a/IPython/config/configloader.py b/IPython/config/configloader.py
@@ -15,7 +15,7 @@
 
 from IPython import ultraTB
 from IPython.ipstruct import Struct
-from IPython.genutils import *
+from IPython.utils.genutils import *
 
 class ConfigLoaderError(exceptions.Exception):
     """Exception for ConfigLoader class."""
diff --git a/IPython/core/completer.py b/IPython/core/completer.py
@@ -83,7 +83,7 @@
 except NameError:
     from sets import Set as set
 
-from IPython.genutils import debugx, dir2
+from IPython.utils.genutils import debugx, dir2
 
 __all__ = ['Completer','IPCompleter']
 
diff --git a/IPython/core/crashhandler.py b/IPython/core/crashhandler.py
@@ -28,7 +28,7 @@
 from IPython import ultraTB
 from IPython.Itpl import itpl
 
-from IPython.genutils import *
+from IPython.utils.genutils import *
 
 #****************************************************************************
 class CrashHandler:
diff --git a/IPython/core/debugger.py b/IPython/core/debugger.py
@@ -33,7 +33,7 @@
 
 from IPython import PyColorize, ipapi
 from IPython.utils import coloransi
-from IPython.genutils import Term
+from IPython.utils.genutils import Term
 from IPython.core.excolors import exception_colors
 
 # See if we can use pydb.
diff --git a/IPython/external/mglob.py b/IPython/external/mglob.py
@@ -213,7 +213,7 @@ def main():
     print "\n".join(expand(sys.argv[1:])),
 
 def mglob_f(self, arg):
-    from IPython.genutils import SList
+    from IPython.utils.genutils import SList
     if arg.strip():
         return SList(expand(arg))
     print "Please specify pattern!"
diff --git a/IPython/frontend/prefilterfrontend.py b/IPython/frontend/prefilterfrontend.py
@@ -33,7 +33,7 @@
 
 from IPython.kernel.core.sync_traceback_trap import SyncTracebackTrap
 
-from IPython.genutils import Term
+from IPython.utils.genutils import Term
 
 from linefrontendbase import LineFrontEndBase, common_prefix
 
diff --git a/IPython/gui/wx/ipshell_nonblocking.py b/IPython/gui/wx/ipshell_nonblocking.py
@@ -25,6 +25,7 @@
 
 try:
     import IPython
+    from IPython.utils import genutils
 except Exception,e:
     print "Error importing IPython (%s)" % str(e)
     raise Exception, e
@@ -143,11 +144,11 @@ def init_ipython0(self, argv=[], user_ns={}, user_global_ns=None,
         #only one instance can be instanciated else tehre will be
         #cin/cout/cerr clash...
         if cin:
-            IPython.genutils.Term.cin = cin
+            genutils.Term.cin = cin
         if cout:
-            IPython.genutils.Term.cout = cout
+            genutils.Term.cout = cout
         if cerr:
-            IPython.genutils.Term.cerr = cerr
+            genutils.Term.cerr = cerr
         
         excepthook = sys.excepthook
 
diff --git a/IPython/history.py b/IPython/history.py
@@ -5,8 +5,7 @@
 import fnmatch
 import os
 
-# IPython imports
-from IPython.genutils import Term, ask_yes_no, warn
+from IPython.utils.genutils import Term, ask_yes_no, warn
 import IPython.ipapi
 
 def magic_history(self, parameter_s = ''):
diff --git a/IPython/hooks.py b/IPython/hooks.py
@@ -44,7 +44,7 @@ def calljed(self,filename, linenum):
 from IPython import ipapi
 
 import os,bisect
-from genutils import Term,shell
+from IPython.utils.genutils import Term,shell
 from pprint import PrettyPrinter
 
 # List here all the default hooks.  For now it's just the editor functions
diff --git a/IPython/iplib.py b/IPython/iplib.py
@@ -55,7 +55,7 @@
 from IPython.Prompts import CachedOutput
 from IPython.ipstruct import Struct
 from IPython.lib.backgroundjobs import BackgroundJobManager
-from IPython.genutils import *
+from IPython.utils.genutils import *
 from IPython.strdispatch import StrDispatch
 import IPython.ipapi
 import IPython.history
diff --git a/IPython/ipmaker.py b/IPython/ipmaker.py
@@ -51,7 +51,7 @@
 from IPython.config.configloader import ConfigLoader
 from IPython.iplib import InteractiveShell
 from IPython.usage import cmd_line_usage,interactive_usage
-from IPython.genutils import *
+from IPython.utils.genutils import *
 
 def force_import(modname,force_reload=False):
     if modname in sys.modules and force_reload:
diff --git a/IPython/ipstruct.py b/IPython/ipstruct.py
@@ -14,7 +14,7 @@
 import types
 import pprint
 
-from IPython.genutils import list2dict2
+from IPython.utils.genutils import list2dict2
 
 class Struct:
     """Class to mimic C structs but also provide convenient dictionary-like
diff --git a/IPython/kernel/config/__init__.py b/IPython/kernel/config/__init__.py
@@ -20,7 +20,7 @@
 
 from IPython.external.configobj import ConfigObj
 from IPython.config.api import ConfigObjManager
-from IPython.genutils import get_ipython_dir, get_security_dir
+from IPython.utils.genutils import get_ipython_dir, get_security_dir
 
 default_kernel_config = ConfigObj()
 
diff --git a/IPython/kernel/controllerservice.py b/IPython/kernel/controllerservice.py
@@ -50,7 +50,7 @@
     IEngineSerialized, \
     IEngineQueued
     
-from IPython.genutils import get_ipython_dir
+from IPython.utils.genutils import get_ipython_dir
 from IPython.kernel import codeutil
 
 #-------------------------------------------------------------------------------
diff --git a/IPython/kernel/core/prompts.py b/IPython/kernel/core/prompts.py
@@ -30,7 +30,7 @@
 from IPython.utils import coloransi
 from IPython import Release
 from IPython.ipapi import TryNext
-from IPython.genutils import *
+from IPython.utils.genutils import *
 import IPython.utils.generics
 
 #****************************************************************************
diff --git a/IPython/kernel/core/ultraTB.py b/IPython/kernel/core/ultraTB.py
@@ -94,7 +94,7 @@
 from IPython.core import debugger
 from IPython.ipstruct import Struct
 from IPython.core.excolors import exception_colors
-from IPython.genutils import Term,uniq_stable,error,info
+from IPython.utils.genutils import Term,uniq_stable,error,info
 
 # Globals
 # amount of space to put line numbers before verbose tracebacks
diff --git a/IPython/kernel/map.py b/IPython/kernel/map.py
@@ -21,7 +21,7 @@
 
 import types
 
-from IPython.genutils import flatten as genutil_flatten
+from IPython.utils.genutils import flatten as genutil_flatten
 
 #-------------------------------------------------------------------------------
 # Figure out which array packages are present and their array types
diff --git a/IPython/kernel/scripts/ipcluster.py b/IPython/kernel/scripts/ipcluster.py
@@ -29,7 +29,7 @@
 
 from IPython.external import argparse
 from IPython.external import Itpl
-from IPython.genutils import (
+from IPython.utils.genutils import (
     get_ipython_dir, 
     get_log_dir, 
     get_security_dir, 
diff --git a/IPython/kernel/scripts/ipcontroller.py b/IPython/kernel/scripts/ipcontroller.py
@@ -42,7 +42,7 @@
 # Create various ipython directories if they don't exist.
 # This must be done before IPython.kernel.config is imported.
 from IPython.iplib import user_setup
-from IPython.genutils import get_ipython_dir, get_log_dir, get_security_dir
+from IPython.utils.genutils import get_ipython_dir, get_log_dir, get_security_dir
 if os.name == 'posix':
     rc_suffix = ''
 else:
diff --git a/IPython/kernel/scripts/ipengine.py b/IPython/kernel/scripts/ipengine.py
@@ -37,7 +37,7 @@
 # Create various ipython directories if they don't exist.
 # This must be done before IPython.kernel.config is imported.
 from IPython.iplib import user_setup
-from IPython.genutils import get_ipython_dir, get_log_dir, get_security_dir
+from IPython.utils.genutils import get_ipython_dir, get_log_dir, get_security_dir
 if os.name == 'posix':
     rc_suffix = ''
 else:
diff --git a/IPython/lib/backgroundjobs.py b/IPython/lib/backgroundjobs.py
@@ -31,7 +31,7 @@
 import threading
 
 from IPython.ultraTB import AutoFormattedTB
-from IPython.genutils import warn,error
+from IPython.utils.genutils import warn,error
 
 class BackgroundJobManager:
     """Class to manage a pool of backgrounded threaded jobs.
diff --git a/IPython/lib/demo.py b/IPython/lib/demo.py
@@ -169,7 +169,7 @@
 import sys
 
 from IPython.PyColorize import Parser
-from IPython.genutils import marquee, file_read, file_readlines
+from IPython.utils.genutils import marquee, file_read, file_readlines
 
 __all__ = ['Demo','IPythonDemo','LineDemo','IPythonLineDemo','DemoError']
 
diff --git a/IPython/macro.py b/IPython/macro.py
@@ -9,7 +9,7 @@
 
 import IPython.ipapi 
 
-from IPython.genutils import Term
+from IPython.utils.genutils import Term
 from IPython.ipapi import IPyAutocall
 
 class Macro(IPyAutocall):
diff --git a/IPython/shellglobals.py b/IPython/shellglobals.py
diff --git a/IPython/testing/mkdoctests.py b/IPython/testing/mkdoctests.py
diff --git a/IPython/testing/plugin/ipdoctest.py b/IPython/testing/plugin/ipdoctest.py
diff --git a/IPython/twshell.py b/IPython/twshell.py
diff --git a/IPython/ultraTB.py b/IPython/ultraTB.py
diff --git a/IPython/utils/genutils.py b/IPython/utils/genutils.py
diff --git a/IPython/utils/tests/test_genutils.py b/IPython/utils/tests/test_genutils.py
diff --git a/IPython/utils/tests/test_imports.py b/IPython/utils/tests/test_imports.py
diff --git a/IPython/wildcard.py b/IPython/wildcard.py
diff --git a/docs/source/development/reorg.txt b/docs/source/development/reorg.txt
