[Python-checkins] distutils2: moved extension into compiler/
tarek.ziade
python-checkins at python.org
Sat Nov 13 12:02:33 CET 2010
tarek.ziade pushed f61ba4e5b4aa to distutils2:
http://hg.python.org/distutils2/rev/f61ba4e5b4aa
changeset: 814:f61ba4e5b4aa
tag: tip
user: Tarek Ziade <tarek at ziade.org>
date: Sat Nov 13 12:02:06 2010 +0100
summary: moved extension into compiler/
files: distutils2/command/build_ext.py, distutils2/compiler/extension.py, distutils2/extension.py, distutils2/tests/test_command_build.py, distutils2/tests/test_command_build_ext.py, distutils2/tests/test_command_install_lib.py, distutils2/tests/test_extension.py
diff --git a/distutils2/command/build_ext.py b/distutils2/command/build_ext.py
--- a/distutils2/command/build_ext.py
+++ b/distutils2/command/build_ext.py
@@ -14,7 +14,7 @@
DistutilsPlatformError, DistutilsSetupError)
from distutils2.compiler import customize_compiler, show_compilers
from distutils2.util import newer_group
-from distutils2.extension import Extension
+from distutils2.compiler.extension import Extension
from distutils2 import logger
try:
import sysconfig
diff --git a/distutils2/extension.py b/distutils2/compiler/extension.py
rename from distutils2/extension.py
rename to distutils2/compiler/extension.py
diff --git a/distutils2/tests/test_command_build.py b/distutils2/tests/test_command_build.py
--- a/distutils2/tests/test_command_build.py
+++ b/distutils2/tests/test_command_build.py
@@ -4,10 +4,7 @@
from distutils2.command.build import build
from distutils2.tests import unittest, support
-try:
- from sysconfig import get_platform
-except ImportError:
- from distutils2._backport.sysconfig import get_platform
+from distutils2._backport.sysconfig import get_platform
class BuildTestCase(support.TempdirManager,
support.LoggingCatcher,
diff --git a/distutils2/tests/test_command_build_ext.py b/distutils2/tests/test_command_build_ext.py
--- a/distutils2/tests/test_command_build_ext.py
+++ b/distutils2/tests/test_command_build_ext.py
@@ -5,17 +5,13 @@
import distutils2.tests
from distutils2.tests import unittest
-from distutils2.extension import Extension
+from distutils2.compiler.extension import Extension
from distutils2.dist import Distribution
from distutils2.command.build_ext import build_ext
from distutils2.tests import support
-from distutils2.extension import Extension
from distutils2.errors import (UnknownFileError, DistutilsSetupError,
CompileError)
-try:
- import sysconfig
-except ImportError:
- from distutils2._backport import sysconfig
+from distutils2._backport import sysconfig
# http://bugs.python.org/issue4373
diff --git a/distutils2/tests/test_command_install_lib.py b/distutils2/tests/test_command_install_lib.py
--- a/distutils2/tests/test_command_install_lib.py
+++ b/distutils2/tests/test_command_install_lib.py
@@ -3,7 +3,7 @@
import os
from distutils2.command.install_lib import install_lib
-from distutils2.extension import Extension
+from distutils2.compiler.extension import Extension
from distutils2.tests import unittest, support
from distutils2.errors import DistutilsOptionError
diff --git a/distutils2/tests/test_extension.py b/distutils2/tests/test_extension.py
--- a/distutils2/tests/test_extension.py
+++ b/distutils2/tests/test_extension.py
@@ -1,7 +1,7 @@
"""Tests for distutils.extension."""
import os
-from distutils2.extension import Extension
+from distutils2.compiler.extension import Extension
from distutils2.tests import unittest
class ExtensionTestCase(unittest.TestCase):
--
Repository URL: http://hg.python.org/distutils2
More information about the Python-checkins
mailing list