1 files changed, 8 insertions, 34 deletions
diff --git a/lib/testtools/testtools/utils.py b/lib/testtools/testtools/utils.py
index c0845b610c..0f39d8f5b6 100644
--- a/lib/testtools/testtools/utils.py
+++ b/lib/testtools/testtools/utils.py
@@ -1,39 +1,13 @@
-# Copyright (c) 2008 Jonathan M. Lange. See LICENSE for details.
+# Copyright (c) 2008-2010 testtools developers. See LICENSE for details.
 
-"""Utilities for dealing with stuff in unittest."""
+"""Utilities for dealing with stuff in unittest.
 
+Legacy - deprecated - use testtools.testsuite.iterate_tests
+"""
 
-import sys
+import warnings
+warnings.warn("Please import iterate_tests from testtools.testsuite - "
+    "testtools.utils is deprecated.", DeprecationWarning, stacklevel=2)
 
-__metaclass__ = type
-__all__ = [
-    'iterate_tests',
-    ]
+from testtools.testsuite import iterate_tests
 
-
-if sys.version_info > (3, 0):
-    def _u(s):
-        """Replacement for u'some string' in Python 3."""
-        return s
-    def _b(s):
-        """A byte literal."""
-        return s.encode("latin-1")
-    advance_iterator = next
-else:
-    def _u(s):
-        return unicode(s, "latin-1")
-    def _b(s):
-        return s
-    advance_iterator = lambda it: it.next()
-
-
-def iterate_tests(test_suite_or_case):
-    """Iterate through all of the test cases in 'test_suite_or_case'."""
-    try:
-        suite = iter(test_suite_or_case)
-    except TypeError:
-        yield test_suite_or_case
-    else:
-        for test in suite:
-            for subtest in iterate_tests(test):
-                yield subtest