irunner.py => lib/irunner.py and imports updated.

IPython/lib/tests/test_imports.py

@@ -8,4 +8,7 b' def test_import_deepreload():'
     from IPython.lib import deepreload
 
 def test_import_demo():
-    from IPython.lib import demo
  No newline at end of file
+    from IPython.lib import demo
+
+def test_import_irunner():
+    from IPython.lib import demo

IPython/testing/attic/ipdoctest.py

@@ -92,7 +92,7 b' __builtin__._ip = ipapi.get()'
 
 
 # runner
-from IPython.irunner import IPythonRunner
+from IPython.lib.irunner import IPythonRunner
 iprunner = IPythonRunner(echo=False)
 
 ###########################################################################

IPython/testing/iptest.py

@@ -99,7 +99,7 b" if not os.name == 'posix':"
     EXCLUDE.append(pjoin('IPython', 'platutils_posix'))
 
 if not have_pexpect:
-    EXCLUDE.append(pjoin('IPython', 'irunner'))
+    EXCLUDE.append(pjoin('IPython', 'lib', 'irunner'))
 
 # This is needed for the reg-exp to match on win32 in the ipdoctest plugin.
 if sys.platform == 'win32':

IPython/testing/mkdoctests.py

@@ -37,7 +37,7 b' import sys'
 import tempfile
 
 # IPython-specific libraries
-from IPython import irunner
+from IPython.lib import irunner
 from IPython.utils.genutils import fatal
 
 class IndentOut(object):