ordering / code layout

2 files changed, 9 insertions, 4 deletions

diff --git a/src/distutils2/command/__init__.py b/src/distutils2/command/__init__.py
index 82ebe63..4ae17ae 100644
--- a/src/distutils2/command/__init__.py
+++ b/src/distutils2/command/__init__.py
@@ -6,6 +6,7 @@ commands."""
 __revision__ = "$Id: __init__.py 71473 2009-04-11 14:55:07Z tarek.ziade $"
 
 __all__ = ['check',
+           'test',
            'build',
            'build_py',
            'build_ext',
@@ -23,6 +24,5 @@ __all__ = ['check',
            'bdist_dumb',
            'bdist_wininst',
            'register',
-           'test',
            'upload',
           ]
diff --git a/src/distutils2/command/test.py b/src/distutils2/command/test.py
index 53ffc38..0f7ba1f 100644
--- a/src/distutils2/command/test.py
+++ b/src/distutils2/command/test.py
@@ -1,11 +1,16 @@
 import os
 import sys
+import unittest
+import warnings
+
 from distutils2 import log
 from distutils2.core import Command
-from distutils2._backport.pkgutil import get_distribution
 from distutils2.util import resolve_name
-import unittest
-import warnings
+
+try:
+    from pkgutil import get_distribution
+except ImportError:
+    from distutils2._backport.pkgutil import get_distribution
 
 class test(Command):