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

IPython/Extensions/InterpreterExec.py

@@ -50,7 +50,7 b' del InteractiveShell,prefilter_shell'
 
 # 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

IPython/Extensions/ext_rescapture.py

@@ -9,7 +9,7 b' var = !ls'
 """
 
 import IPython.ipapi
-from IPython.genutils import *
+from IPython.utils.genutils import *
 
 ip = IPython.ipapi.get()
 

IPython/Extensions/ipipe.py

@@ -133,7 +133,7 b' from IPython.external import simplegeneric'
 from IPython.external import path
 
 try:
-    from IPython import genutils
+    from IPython.utils import genutils
     from IPython.utils import generics
 except ImportError:
     genutils = None

IPython/Extensions/ipy_greedycompleter.py

@@ -11,7 +11,7 b' do the same in default completer.'
 """
 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.

IPython/Extensions/ipy_legacy.py

@@ -14,7 +14,7 b' ip = IPython.ipapi.get()'
 
 import os,sys
 
-from IPython.genutils import *
+from IPython.utils.genutils import *
 
 # use rehashx
 

IPython/Extensions/ipy_pretty.py

@@ -17,7 +17,7 b' for numpy dtype objects, add the following to your ipy_user_conf.py::'
 """
 
 import IPython.ipapi
-from IPython.genutils import Term
+from IPython.utils.genutils import Term
 
 from IPython.external import pretty
 

IPython/Extensions/ipy_profile_sh.py

@@ -156,9 +156,9 b' 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!

IPython/Extensions/ipy_pydb.py

@@ -1,6 +1,6 b''
 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

IPython/Extensions/ipy_traits_completer.py

@@ -53,7 +53,7 b' from enthought.traits import api as T'
 
 # IPython imports
 from IPython.ipapi import TryNext, get as ipget
-from IPython.genutils import dir2
+from IPython.utils.genutils import dir2
 try:
     set
 except:

IPython/Extensions/jobctrl.py

@@ -45,7 +45,7 b' from subprocess import *'
 import os,shlex,sys,time
 import threading,Queue
 
-from IPython import genutils
+from IPython.utils import genutils
 
 import IPython.ipapi
 

IPython/Gnuplot2.py

@@ -25,7 +25,7 b' import types'
 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

IPython/GnuplotInteractive.py

@@ -16,7 +16,7 b" __all__ = ['Gnuplot','gp','gp_new','plot','plot2','splot','replot',"
            '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

IPython/GnuplotRuntime.py

@@ -53,7 +53,7 b" __all__ = ['Gnuplot','gp','gp_new','Data','File','Func','GridData',"
            '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

IPython/Magic.py

@@ -50,7 +50,7 b' from IPython.Itpl import Itpl, itpl, printpl,itplns'
 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

IPython/OInspect.py

@@ -28,7 +28,7 b' import types'
 
 # 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 *

IPython/Prompts.py

@@ -28,7 +28,7 b' from IPython.ipstruct import Struct'
 from IPython.macro import Macro
 import IPython.utils.generics
 
-from IPython.genutils import *
+from IPython.utils.genutils import *
 
 #****************************************************************************
 #Color schemes for Prompts.

IPython/Shell.py

@@ -36,7 +36,7 b' except ImportError:'
 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

IPython/UserConfig/ipythonrc

@@ -504,9 +504,9 b' 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

IPython/config/api.py

@@ -18,7 +18,7 b' __docformat__ = "restructuredtext en"'
 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
 
 

IPython/config/configloader.py

@@ -15,7 +15,7 b' from pprint import pprint'
 
 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."""

IPython/core/completer.py

@@ -83,7 +83,7 b' try:'
 except NameError:
     from sets import Set as set
 
-from IPython.genutils import debugx, dir2
+from IPython.utils.genutils import debugx, dir2
 
 __all__ = ['Completer','IPCompleter']
 

IPython/core/crashhandler.py

@@ -28,7 +28,7 b' from IPython import Release'
 from IPython import ultraTB
 from IPython.Itpl import itpl
 
-from IPython.genutils import *
+from IPython.utils.genutils import *
 
 #****************************************************************************
 class CrashHandler:

IPython/core/debugger.py

@@ -33,7 +33,7 b' import sys'
 
 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.

IPython/external/mglob.py

@@ -213,7 +213,7 b' 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!"

IPython/frontend/prefilterfrontend.py

@@ -33,7 +33,7 b' from IPython.kernel.core.redirector_output_trap import RedirectorOutputTrap'
 
 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
 

IPython/gui/wx/ipshell_nonblocking.py

@@ -25,6 +25,7 b' from thread_ex import ThreadEx'
 
 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 b' class NonBlockingIPShell(object):'
         #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
 

IPython/history.py

@@ -5,8 +5,7 b''
 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 = ''):

IPython/hooks.py

@@ -44,7 +44,7 b' somewhere in your configuration files or ipython command line.'
 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

IPython/iplib.py

@@ -55,7 +55,7 b' from IPython.Magic import Magic'
 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

IPython/ipmaker.py

@@ -51,7 +51,7 b' from IPython.OutputTrap import OutputTrap'
 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:

IPython/ipstruct.py

@@ -14,7 +14,7 b" __all__ = ['Struct']"
 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

IPython/kernel/config/__init__.py

@@ -20,7 +20,7 b' from os.path import join as pjoin'
 
 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()
 

IPython/kernel/controllerservice.py

@@ -50,7 +50,7 b' from IPython.kernel.engineservice import \\'
     IEngineSerialized, \
     IEngineQueued
     
-from IPython.genutils import get_ipython_dir
+from IPython.utils.genutils import get_ipython_dir
 from IPython.kernel import codeutil
 
 #-------------------------------------------------------------------------------

IPython/kernel/core/prompts.py

@@ -30,7 +30,7 b' from IPython.external.Itpl import ItplNS'
 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
 
 #****************************************************************************

IPython/kernel/core/ultraTB.py

@@ -94,7 +94,7 b' from IPython import PyColorize'
 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

IPython/kernel/map.py

@@ -21,7 +21,7 b' __docformat__ = "restructuredtext en"'
 
 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

IPython/kernel/scripts/ipcluster.py

@@ -29,7 +29,7 b' from twisted.python import failure, log'
 
 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, 

IPython/kernel/scripts/ipcontroller.py

@@ -42,7 +42,7 b' from IPython.kernel.fcutil import check_furl_file_security'
 # 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:

IPython/kernel/scripts/ipengine.py

@@ -37,7 +37,7 b' from IPython.kernel.engineservice import EngineService'
 # 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:

IPython/lib/backgroundjobs.py

@@ -31,7 +31,7 b' import sys'
 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.

IPython/lib/demo.py

@@ -169,7 +169,7 b' import shlex'
 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']
 

IPython/macro.py

@@ -9,7 +9,7 b''
 
 import IPython.ipapi 
 
-from IPython.genutils import Term
+from IPython.utils.genutils import Term
 from IPython.ipapi import IPyAutocall
 
 class Macro(IPyAutocall):

IPython/shellglobals.py

@@ -16,7 +16,7 b' except ImportError:'
     HAS_CTYPES = False
 
 # our own
-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
 
 #-----------------------------------------------------------------------------
 # Globals

IPython/testing/mkdoctests.py

@@ -38,7 +38,7 b' import tempfile'
 
 # IPython-specific libraries
 from IPython import irunner
-from IPython.genutils import fatal
+from IPython.utils.genutils import fatal
 
 class IndentOut(object):
     """A simple output stream that indents all output by a fixed amount.

IPython/testing/plugin/ipdoctest.py

@@ -82,7 +82,7 b' class py_file_finder(object):'
         self.test_filename = test_filename
         
     def __call__(self,name):
-        from IPython.genutils import get_py_filename
+        from IPython.utils.genutils import get_py_filename
         try:
             return get_py_filename(name)
         except IOError:

IPython/twshell.py

@@ -11,7 +11,7 b' from IPython.iplib import InteractiveShell'
 from IPython.ipstruct import Struct
 import Queue,thread,threading,signal
 from signal import signal, SIGINT
-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
 import shellglobals
 
 def install_gtk2():

IPython/ultraTB.py

@@ -94,7 +94,7 b' from IPython import PyColorize'
 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

IPython/utils/tests/test_genutils.py

@@ -31,7 +31,7 b' from nose.tools import raises'
 
 # Our own
 import IPython
-from IPython import genutils
+from IPython.utils import genutils
 from IPython.testing.decorators import skipif, skip_if_not_win32
 
 # Platform-dependent imports

IPython/utils/tests/test_imports.py

@@ -10,3 +10,8 b' def test_import_DPyGetOpt():'
 def test_import_generics():
     from IPython.utils import generics
 
+def test_import_genutils():
+    from IPython.utils import genutils
+
+
+

IPython/wildcard.py

@@ -20,7 +20,7 b' import pprint'
 import re
 import types
 
-from IPython.genutils import dir2
+from IPython.utils.genutils import dir2
 
 def create_typestr2type_dicts(dont_include_in_type2type2str=["lambda"]):
     """Return dictionaries mapping lower case typename to type objects, from

docs/source/development/reorg.txt

@@ -114,6 +114,8 b' Where things will be moved'
 
 * :file:`generics.py`.  Move to :file:`IPython.python`.
 
+* :file:`genutils.py`.  Move to :file:`IPython.utils`.
+
 * :file:`Extensions`. This needs to be gone through separately.  Minimally,
   the package should be renamed to :file:`extensions`.
 
@@ -158,8 +160,6 b' Where things will be moved'
 * :file:`frontend`.  Good where it is!
 
 
-* :file:`genutils.py`.  Move to :file:`IPython.python` and break up into different
-  modules.
 
 * :file:`gui`.  Eventually this should be moved to a subdir of   
   :file:`IPython.frontend`.