Rename 'command' to 'distutilscmd'

testtools/__init__.py

@@ -32,6 +32,9 @@ from testtools.helpers import (
 from testtools.matchers import (
     Matcher,
     )
+# Shut up, pyflakes. We are importing for documentation, not for namespacing.
+Matcher
+
 from testtools.runtest import (
     MultipleExceptions,
     RunTest,
@@ -58,9 +61,6 @@ from testtools.testsuite import (
     ConcurrentTestSuite,
     iterate_tests,
     )
-from testtools.command import (
-    TestCommand
-    )
 
 # same format as sys.version_info: "A tuple containing the five components of
 # the version number: major, minor, micro, releaselevel, and serial. All

testtools/tests/__init__.py

@@ -7,11 +7,11 @@ import unittest
 
 def test_suite():
     from testtools.tests import (
-        test_command,
         test_compat,
         test_content,
         test_content_type,
         test_deferredruntest,
+        test_distutilscmd,
         test_fixturesupport,
         test_helpers,
         test_matchers,
@@ -19,23 +19,23 @@ def test_suite():
         test_run,
         test_runtest,
         test_spinner,
-        test_testtools,
         test_testresult,
         test_testsuite,
+        test_testtools,
         )
     modules = [
-        test_command,
         test_compat,
         test_content,
         test_content_type,
         test_deferredruntest,
+        test_distutilscmd,
         test_fixturesupport,
         test_helpers,
         test_matchers,
         test_monkey,
         test_run,
-        test_spinner,
         test_runtest,
+        test_spinner,
         test_testresult,
         test_testsuite,
         test_testtools,

testtools/tests/test_distutilscmd.py

@@ -10,7 +10,7 @@ StringIO = try_imports(['StringIO.StringIO', 'io.StringIO'])
 
 import testtools
 from testtools import TestCase
-from testtools.command import TestCommand
+from testtools.distutilscmd import TestCommand
 
 
 if fixtures: