From 9a4b350a4db866e4768c1d546eaff7fda1dc0a07 2008-07-07 01:51:36
From: Fernando Perez <Fernando.Perez@berkeley.edu>
Date: 2008-07-07 01:51:36
Subject: [PATCH] Testing cleanup of old/conflicting stuff.

---

diff --git a/IPython/testing/ipdoctest.py b/IPython/testing/attic/ipdoctest.py
similarity index 100%
rename from IPython/testing/ipdoctest.py
rename to IPython/testing/attic/ipdoctest.py
diff --git a/IPython/testing/parametric.py b/IPython/testing/attic/parametric.py
similarity index 100%
rename from IPython/testing/parametric.py
rename to IPython/testing/attic/parametric.py
diff --git a/IPython/testing/tcommon.py b/IPython/testing/attic/tcommon.py
similarity index 100%
rename from IPython/testing/tcommon.py
rename to IPython/testing/attic/tcommon.py
diff --git a/IPython/testing/testTEMPLATE.py b/IPython/testing/attic/testTEMPLATE.py
similarity index 100%
rename from IPython/testing/testTEMPLATE.py
rename to IPython/testing/attic/testTEMPLATE.py
diff --git a/IPython/testing/tstTEMPLATE_doctest.py b/IPython/testing/attic/tstTEMPLATE_doctest.py
similarity index 100%
rename from IPython/testing/tstTEMPLATE_doctest.py
rename to IPython/testing/attic/tstTEMPLATE_doctest.py
diff --git a/IPython/testing/tstTEMPLATE_doctest.txt b/IPython/testing/attic/tstTEMPLATE_doctest.txt
similarity index 100%
rename from IPython/testing/tstTEMPLATE_doctest.txt
rename to IPython/testing/attic/tstTEMPLATE_doctest.txt
diff --git a/IPython/testing/tutils.py b/IPython/testing/tutils.py
index 6bb14b4..6a24639 100644
--- a/IPython/testing/tutils.py
+++ b/IPython/testing/tutils.py
@@ -1,6 +1,20 @@
-"""Utilities for testing code.
+"""DEPRECATED - use IPython.testing.util instead.
+
+Utilities for testing code.
 """
 
+#############################################################################
+
+# This was old testing code we never really used in IPython.  The pieces of
+# testing machinery from snakeoil that were good have already been merged into
+# the nose plugin, so this can be taken away soon.  Leave a warning for now,
+# we'll remove it in a later release (around 0.10 or so).
+from warnings import warn
+warn('This will be removed soon.  Use IPython.testing.util instead',
+     DeprecationWarning)
+
+#############################################################################
+
 # Required modules and packages
 
 # Standard Python lib
@@ -36,7 +50,7 @@ def test_path(path):
 
     This finds the correct path of the test package on disk, and prepends it
     to the input path."""
-    
+
     return os.path.join(TEST_PATH,path)
 
 def fullPath(startPath,files):
@@ -55,7 +69,7 @@ def fullPath(startPath,files):
         One or more files.
 
     :Examples:
-    
+
     >>> fullPath('/foo/bar.py',['a.txt','b.txt'])
     ['/foo/a.txt', '/foo/b.txt']
 
@@ -66,7 +80,7 @@ def fullPath(startPath,files):
     >>> fullPath('/foo','a.txt')
     ['/a.txt']
     """
-    
+
     files = utils.list_strings(files)
     base = os.path.split(startPath)[0]
     return [ os.path.join(base,f) for f in files ]