[Python-checkins] distutils2: Don?t import sysconfig from the (2.7) stdlib.

[tarek.ziade]

tarek.ziade pushed 088dbb97fd18 to distutils2:

http://hg.python.org/distutils2/rev/088dbb97fd18
changeset:   830:088dbb97fd18
user:        ?ric Araujo <merwok at netwok.org>
date:        Tue Nov 16 05:36:24 2010 +0100
summary:
  Don?t import sysconfig from the (2.7) stdlib.

distutils2._backport.sysconfig is actually *newer* than the versions in
the 2.7 and 3.2 standard libraries.

files:
  distutils2/command/build_ext.py
  distutils2/command/build_scripts.py
  distutils2/tests/test_command_build_scripts.py
  distutils2/tests/test_cygwinccompiler.py
  distutils2/tests/test_unixccompiler.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
@@ -16,10 +16,7 @@
 from distutils2.util import newer_group
 from distutils2.compiler.extension import Extension
 from distutils2 import logger
-try:
-    import sysconfig
-except ImportError:
-    from distutils2._backport import sysconfig
+from distutils2._backport import sysconfig
 
 # this keeps compatibility from 2.3 to 2.5
 if sys.version < "2.6":
diff --git a/distutils2/command/build_scripts.py b/distutils2/command/build_scripts.py
--- a/distutils2/command/build_scripts.py
+++ b/distutils2/command/build_scripts.py
@@ -9,10 +9,7 @@
 from distutils2.command.cmd import Command
 from distutils2.util import convert_path, newer
 from distutils2 import logger
-try:
-    import sysconfig
-except ImportError:
-    from distutils2._backport import sysconfig
+from distutils2._backport import sysconfig
 from distutils2.compat import Mixin2to3
 
 # check if Python is called on the first line with this expression
diff --git a/distutils2/tests/test_command_build_scripts.py b/distutils2/tests/test_command_build_scripts.py
--- a/distutils2/tests/test_command_build_scripts.py
+++ b/distutils2/tests/test_command_build_scripts.py
@@ -4,10 +4,7 @@
 
 from distutils2.command.build_scripts import build_scripts
 from distutils2.dist import Distribution
-try:
-    import sysconfig
-except ImportError:
-    from distutils2._backport import sysconfig
+from distutils2._backport import sysconfig
 
 from distutils2.tests import unittest, support
 
diff --git a/distutils2/tests/test_cygwinccompiler.py b/distutils2/tests/test_cygwinccompiler.py
--- a/distutils2/tests/test_cygwinccompiler.py
+++ b/distutils2/tests/test_cygwinccompiler.py
@@ -1,10 +1,8 @@
 """Tests for distutils.cygwinccompiler."""
 import sys
 import os
-try:
-    import sysconfig
-except ImportError:
-    from distutils2._backport import sysconfig
+
+from distutils2._backport import sysconfig
 
 from distutils2.tests import run_unittest
 from distutils2.tests import captured_stdout
diff --git a/distutils2/tests/test_unixccompiler.py b/distutils2/tests/test_unixccompiler.py
--- a/distutils2/tests/test_unixccompiler.py
+++ b/distutils2/tests/test_unixccompiler.py
@@ -1,11 +1,7 @@
 """Tests for distutils.unixccompiler."""
 import sys
 
-try:
-    import sysconfig
-except ImportError:
-    from distutils2._backport import sysconfig
-
+from distutils2._backport import sysconfig
 from distutils2.compiler.unixccompiler import UnixCCompiler
 from distutils2.tests import unittest
 

--
Repository URL: http://hg.python.org/distutils2