[Python-checkins] distutils2: ordering / code layout
tarek.ziade
python-checkins at python.org
Sun Sep 19 10:20:22 CEST 2010
tarek.ziade pushed 5aeff08e63ed to distutils2:
http://hg.python.org/distutils2/rev/5aeff08e63ed
changeset: 630:5aeff08e63ed
user: Konrad Delong <konryd at gmail.com>
date: Sun Aug 15 11:40:19 2010 +0200
summary: ordering / code layout
files: src/distutils2/command/__init__.py, src/distutils2/command/test.py
diff --git a/src/distutils2/command/__init__.py b/src/distutils2/command/__init__.py
--- a/src/distutils2/command/__init__.py
+++ b/src/distutils2/command/__init__.py
@@ -6,6 +6,7 @@
__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 @@
'bdist_dumb',
'bdist_wininst',
'register',
- 'test',
'upload',
]
diff --git a/src/distutils2/command/test.py b/src/distutils2/command/test.py
--- 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):
--
Repository URL: http://hg.python.org/distutils2
More information about the Python-checkins
mailing list