diff options
author | cookedm <cookedm@localhost> | 2006-02-02 03:28:25 +0000 |
---|---|---|
committer | cookedm <cookedm@localhost> | 2006-02-02 03:28:25 +0000 |
commit | 9e5252bd45403ddd97252d83ede5eeb6b72e0767 (patch) | |
tree | 5921cfdd13d93e22fe21f79469f355dfb2376021 /numpy/distutils | |
parent | 91473bf148643b2412e595f0897c86076ecae1d2 (diff) | |
download | numpy-9e5252bd45403ddd97252d83ede5eeb6b72e0767.tar.gz |
Remove unused imports
Diffstat (limited to 'numpy/distutils')
-rw-r--r-- | numpy/distutils/command/bdist_rpm.py | 3 | ||||
-rw-r--r-- | numpy/distutils/command/build_clib.py | 9 | ||||
-rw-r--r-- | numpy/distutils/command/build_ext.py | 13 | ||||
-rw-r--r-- | numpy/distutils/command/build_scripts.py | 4 | ||||
-rw-r--r-- | numpy/distutils/command/build_src.py | 9 | ||||
-rw-r--r-- | numpy/distutils/command/install.py | 3 | ||||
-rw-r--r-- | numpy/distutils/command/install_data.py | 1 | ||||
-rw-r--r-- | numpy/distutils/command/install_headers.py | 1 | ||||
-rw-r--r-- | numpy/distutils/command/sdist.py | 6 |
9 files changed, 14 insertions, 35 deletions
diff --git a/numpy/distutils/command/bdist_rpm.py b/numpy/distutils/command/bdist_rpm.py index 04aaea33b..8fd149ab0 100644 --- a/numpy/distutils/command/bdist_rpm.py +++ b/numpy/distutils/command/bdist_rpm.py @@ -1,6 +1,5 @@ - import os -from distutils.command.bdist_rpm import * +import sys from distutils.command.bdist_rpm import bdist_rpm as old_bdist_rpm class bdist_rpm(old_bdist_rpm): diff --git a/numpy/distutils/command/build_clib.py b/numpy/distutils/command/build_clib.py index 5a7c278c0..7b6a0fa69 100644 --- a/numpy/distutils/command/build_clib.py +++ b/numpy/distutils/command/build_clib.py @@ -1,13 +1,8 @@ """ Modified version of build_clib that handles fortran source files. """ -import os -import string -import sys -import re -from glob import glob from distutils.command.build_clib import build_clib as old_build_clib -from distutils.command.build_clib import show_compilers +from distutils.errors import DistutilsSetupError from numpy.distutils import log from distutils.dep_util import newer_group @@ -76,7 +71,7 @@ class build_clib(old_build_clib): dry_run=self.dry_run, force=self.force) self.fcompiler.customize(self.distribution) - + libraries = self.libraries self.libraries = None self.fcompiler.customize_cmd(self) diff --git a/numpy/distutils/command/build_ext.py b/numpy/distutils/command/build_ext.py index 161677c86..735daa6ed 100644 --- a/numpy/distutils/command/build_ext.py +++ b/numpy/distutils/command/build_ext.py @@ -6,14 +6,14 @@ import string import sys from glob import glob -from distutils.dep_util import newer_group, newer +from distutils.dep_util import newer_group from distutils.command.build_ext import build_ext as old_build_ext from numpy.distutils import log from numpy.distutils.misc_util import filter_sources, has_f_sources, \ has_cxx_sources, get_ext_source_files, all_strings, \ get_numpy_include_dirs, is_sequence -from distutils.errors import DistutilsFileError +from distutils.errors import DistutilsFileError, DistutilsSetupError class build_ext (old_build_ext): @@ -86,7 +86,7 @@ class build_ext (old_build_ext): self.compiler.customize(self.distribution,need_cxx=need_cxx_compiler) self.compiler.customize_cmd(self) self.compiler.show_customization() - + # Initialize Fortran/C++ compilers if needed. if need_f_compiler: from numpy.distutils.fcompiler import new_fcompiler @@ -239,7 +239,7 @@ class build_ext (old_build_ext): self.move_file(f, module_build_dir) except DistutilsFileError: # already exists in destination os.remove(f) - + if f_sources: log.info("compiling Fortran sources") f_objects += self.fcompiler.compile(f_sources, @@ -262,14 +262,14 @@ class build_ext (old_build_ext): old_linker_so_0 = self.compiler.linker_so[0] except: pass - + use_fortran_linker = getattr(ext,'language','c') in ['f77','f90'] \ and self.fcompiler is not None c_libraries = [] c_library_dirs = [] if use_fortran_linker or f_sources: use_fortran_linker = 1 - elif self.distribution.has_c_libraries(): + elif self.distribution.has_c_libraries(): build_clib = self.get_finalized_command('build_clib') f_libs = [] for (lib_name, build_info) in build_clib.libraries: @@ -345,4 +345,3 @@ class build_ext (old_build_ext): outputs.append(os.path.join(self.build_lib, self.get_ext_filename(fullname))) return outputs - diff --git a/numpy/distutils/command/build_scripts.py b/numpy/distutils/command/build_scripts.py index c3f3931c3..1217a2c1f 100644 --- a/numpy/distutils/command/build_scripts.py +++ b/numpy/distutils/command/build_scripts.py @@ -25,10 +25,10 @@ class build_scripts(old_build_scripts): if not script: continue if is_string(script): - log.info(" adding '%s' to scripts" % (script)) + log.info(" adding '%s' to scripts" % (script,)) new_scripts.append(script) else: - [log.info(" adding '%s' to scripts" % (s)) for s in script] + [log.info(" adding '%s' to scripts" % (s,)) for s in script] new_scripts.extend(list(script)) return new_scripts diff --git a/numpy/distutils/command/build_src.py b/numpy/distutils/command/build_src.py index b3f006c51..d3f926ffa 100644 --- a/numpy/distutils/command/build_src.py +++ b/numpy/distutils/command/build_src.py @@ -3,20 +3,15 @@ import os import re -import copy -from distutils.cmd import Command -from distutils.command import build_ext, build_py -from distutils.util import convert_path +from distutils.command import build_ext from distutils.dep_util import newer_group, newer from numpy.distutils import log -from numpy.distutils.misc_util import fortran_ext_match, all_strings, dot_join,\ +from numpy.distutils.misc_util import fortran_ext_match, \ appendpath, is_string, is_sequence from numpy.distutils.from_template import process_file as process_f_file from numpy.distutils.conv_template import process_file as process_c_file -from numpy.distutils.extension import Extension -from numpy.distutils.system_info import get_info, dict_append class build_src(build_ext.build_ext): diff --git a/numpy/distutils/command/install.py b/numpy/distutils/command/install.py index f48895b39..3803363fe 100644 --- a/numpy/distutils/command/install.py +++ b/numpy/distutils/command/install.py @@ -1,6 +1,3 @@ - -import os -from distutils.command.install import * from distutils.command.install import install as old_install from distutils.file_util import write_file diff --git a/numpy/distutils/command/install_data.py b/numpy/distutils/command/install_data.py index e170ba4d8..b72737f85 100644 --- a/numpy/distutils/command/install_data.py +++ b/numpy/distutils/command/install_data.py @@ -1,4 +1,3 @@ -from distutils.command.install_data import * from distutils.command.install_data import install_data as old_install_data #data installer with improved intelligence over distutils diff --git a/numpy/distutils/command/install_headers.py b/numpy/distutils/command/install_headers.py index f029764d0..58ace1064 100644 --- a/numpy/distutils/command/install_headers.py +++ b/numpy/distutils/command/install_headers.py @@ -1,5 +1,4 @@ import os -from distutils.command.install import * from distutils.command.install_headers import install_headers as old_install_headers class install_headers (old_install_headers): diff --git a/numpy/distutils/command/sdist.py b/numpy/distutils/command/sdist.py index a02bdbe45..9134fed53 100644 --- a/numpy/distutils/command/sdist.py +++ b/numpy/distutils/command/sdist.py @@ -1,5 +1,3 @@ - -from distutils.command.sdist import * from distutils.command.sdist import sdist as old_sdist from numpy.distutils.misc_util import get_data_files @@ -9,7 +7,7 @@ class sdist(old_sdist): old_sdist.add_defaults(self) dist = self.distribution - + if dist.has_data_files(): for data in dist.data_files: self.filelist.extend(get_data_files(data)) @@ -22,5 +20,3 @@ class sdist(old_sdist): self.filelist.extend(headers) return - - |