summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Bedini <andrea@andreabedini.com>2015-05-16 19:59:12 +1000
committerAndrea Bedini <andrea@andreabedini.com>2015-05-16 19:59:12 +1000
commit3b825d35fdcc72ae4790c70c139639a6bd7df178 (patch)
tree26251764449f3529b7dc4b23ab4bba53d7390cac
parent0a02b82ed72f0268875bfc6c70d1e8a8dad6c644 (diff)
downloadnumpy-3b825d35fdcc72ae4790c70c139639a6bd7df178.tar.gz
Simplify numpy/distutils/__init__.py
Thanks to the presence of from __future__ import absolute_import we don't need different code paths for Python 2/3.
-rw-r--r--numpy/distutils/__init__.py40
1 files changed, 12 insertions, 28 deletions
diff --git a/numpy/distutils/__init__.py b/numpy/distutils/__init__.py
index c16b10ae5..9297185ef 100644
--- a/numpy/distutils/__init__.py
+++ b/numpy/distutils/__init__.py
@@ -2,36 +2,20 @@ from __future__ import division, absolute_import, print_function
import sys
-if sys.version_info[0] < 3:
- from .__version__ import version as __version__
- # Must import local ccompiler ASAP in order to get
- # customized CCompiler.spawn effective.
- from . import ccompiler
- from . import unixccompiler
+from .__version__ import version as __version__
+# Must import local ccompiler ASAP in order to get
+# customized CCompiler.spawn effective.
+from . import ccompiler
+from . import unixccompiler
- from .info import __doc__
- from .npy_pkg_config import *
+from .info import __doc__
+from .npy_pkg_config import *
- try:
- from . import __config__
- _INSTALLED = True
- except ImportError:
- _INSTALLED = False
-else:
- from numpy.distutils.__version__ import version as __version__
- # Must import local ccompiler ASAP in order to get
- # customized CCompiler.spawn effective.
- import numpy.distutils.ccompiler
- import numpy.distutils.unixccompiler
-
- from numpy.distutils.info import __doc__
- from numpy.distutils.npy_pkg_config import *
-
- try:
- import numpy.distutils.__config__
- _INSTALLED = True
- except ImportError:
- _INSTALLED = False
+try:
+ from . import __config__
+ _INSTALLED = True
+except ImportError:
+ _INSTALLED = False
if _INSTALLED:
from numpy.testing import Tester