summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author?ric Araujo <merwok@netwok.org>2010-11-16 05:36:24 +0100
committer?ric Araujo <merwok@netwok.org>2010-11-16 05:36:24 +0100
commitdcd4fafaa4132313a4c6cc79f0bf1d9a49ed80dd (patch)
treed0d8f2fd561d1bc3df73457c4d0d9f83a1a3ed2a
parent48875e0b852319235af87e7008697c588b553491 (diff)
downloaddisutils2-dcd4fafaa4132313a4c6cc79f0bf1d9a49ed80dd.tar.gz
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.
-rw-r--r--distutils2/command/build_ext.py5
-rw-r--r--distutils2/command/build_scripts.py5
-rw-r--r--distutils2/tests/test_command_build_scripts.py5
-rw-r--r--distutils2/tests/test_cygwinccompiler.py6
-rw-r--r--distutils2/tests/test_unixccompiler.py6
5 files changed, 6 insertions, 21 deletions
diff --git a/distutils2/command/build_ext.py b/distutils2/command/build_ext.py
index 0df3db8..5302faa 100644
--- a/distutils2/command/build_ext.py
+++ b/distutils2/command/build_ext.py
@@ -16,10 +16,7 @@ from distutils2.compiler import customize_compiler, show_compilers
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
index e0c8bcb..89cdded 100644
--- a/distutils2/command/build_scripts.py
+++ b/distutils2/command/build_scripts.py
@@ -9,10 +9,7 @@ from stat import ST_MODE
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
index fd5ca49..e8cf045 100644
--- a/distutils2/tests/test_command_build_scripts.py
+++ b/distutils2/tests/test_command_build_scripts.py
@@ -4,10 +4,7 @@ import os
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
index 679f447..aebafac 100644
--- 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
index 5126746..59da40e 100644
--- 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