massive import cleaning in Distutils
diff --git a/Lib/distutils/command/bdist.py b/Lib/distutils/command/bdist.py
index 8e0ad08..8cd6970 100644
--- a/Lib/distutils/command/bdist.py
+++ b/Lib/distutils/command/bdist.py
@@ -6,9 +6,9 @@
__revision__ = "$Id$"
import os
-from types import *
+
from distutils.core import Command
-from distutils.errors import *
+from distutils.errors import DistutilsPlatformError, DistutilsOptionError
from distutils.util import get_platform
@@ -16,7 +16,7 @@
"""Print list of available formats (arguments to "--format" option).
"""
from distutils.fancy_getopt import FancyGetopt
- formats=[]
+ formats = []
for format in bdist.format_commands:
formats.append(("formats=" + format, None,
bdist.format_command[format][1]))
diff --git a/Lib/distutils/command/bdist_msi.py b/Lib/distutils/command/bdist_msi.py
index 7a5ca80..f3791be 100644
--- a/Lib/distutils/command/bdist_msi.py
+++ b/Lib/distutils/command/bdist_msi.py
@@ -28,7 +28,6 @@
default, cancel, bitmap=true)"""
Dialog.__init__(self, *args)
ruler = self.h - 36
- bmwidth = 152*ruler/328
#if kw.get("bitmap", True):
# self.bitmap("Bitmap", 0, 0, bmwidth, ruler, "PythonWin")
self.line("BottomLine", 0, ruler, self.w, 0)
@@ -420,7 +419,6 @@
# see "Dialog Style Bits"
modal = 3 # visible | modal
modeless = 1 # visible
- track_disk_space = 32
# UI customization properties
add_data(db, "Property",
diff --git a/Lib/distutils/command/bdist_rpm.py b/Lib/distutils/command/bdist_rpm.py
index 1eccc6a..6d9d47d 100644
--- a/Lib/distutils/command/bdist_rpm.py
+++ b/Lib/distutils/command/bdist_rpm.py
@@ -5,14 +5,15 @@
__revision__ = "$Id$"
-import sys, os, string
-from types import *
+import sys
+import os
+import string
+
from distutils.core import Command
from distutils.debug import DEBUG
-from distutils.util import get_platform
from distutils.file_util import write_file
-from distutils.errors import *
-from distutils.sysconfig import get_python_version
+from distutils.errors import (DistutilsOptionError, DistutilsPlatformError,
+ DistutilsFileError, DistutilsExecError)
from distutils import log
class bdist_rpm (Command):
@@ -225,7 +226,7 @@
self.distribution.get_contact_email()))
self.ensure_string('packager')
self.ensure_string_list('doc_files')
- if type(self.doc_files) is ListType:
+ if isinstance(self.doc_files, list):
for readme in ('README', 'README.txt'):
if os.path.exists(readme) and readme not in self.doc_files:
self.doc_files.append(readme)
@@ -444,7 +445,7 @@
'Obsoletes',
):
val = getattr(self, string.lower(field))
- if type(val) is ListType:
+ if isinstance(val, list):
spec_file.append('%s: %s' % (field, string.join(val)))
elif val is not None:
spec_file.append('%s: %s' % (field, val))
diff --git a/Lib/distutils/command/bdist_wininst.py b/Lib/distutils/command/bdist_wininst.py
index 8a6eca5..cf4282d 100644
--- a/Lib/distutils/command/bdist_wininst.py
+++ b/Lib/distutils/command/bdist_wininst.py
@@ -5,11 +5,14 @@
__revision__ = "$Id$"
-import sys, os, string
+import sys
+import os
+import string
+
from distutils.core import Command
from distutils.util import get_platform
-from distutils.dir_util import create_tree, remove_tree
-from distutils.errors import *
+from distutils.dir_util import remove_tree
+from distutils.errors import DistutilsOptionError, DistutilsPlatformError
from distutils.sysconfig import get_python_version
from distutils import log
diff --git a/Lib/distutils/command/build_clib.py b/Lib/distutils/command/build_clib.py
index 9545b27..50b64db 100644
--- a/Lib/distutils/command/build_clib.py
+++ b/Lib/distutils/command/build_clib.py
@@ -18,7 +18,7 @@
import os
from distutils.core import Command
-from distutils.errors import *
+from distutils.errors import DistutilsSetupError
from distutils.sysconfig import customize_compiler
from distutils import log
diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
index 0c79476..ff1a4be 100644
--- a/Lib/distutils/command/build_ext.py
+++ b/Lib/distutils/command/build_ext.py
@@ -10,7 +10,8 @@
from warnings import warn
from distutils.core import Command
-from distutils.errors import *
+from distutils.errors import (CCompilerError, DistutilsError, CompileError,
+ DistutilsSetupError, DistutilsPlatformError)
from distutils.sysconfig import customize_compiler, get_python_version
from distutils.dep_util import newer_group
from distutils.extension import Extension
diff --git a/Lib/distutils/command/build_py.py b/Lib/distutils/command/build_py.py
index 5c7b473..04c455f 100644
--- a/Lib/distutils/command/build_py.py
+++ b/Lib/distutils/command/build_py.py
@@ -133,7 +133,6 @@
def build_package_data(self):
"""Copy data files into build directory"""
- lastdir = None
for package, src_dir, build_dir, filenames in self.data_files:
for filename in filenames:
target = os.path.join(build_dir, filename)
diff --git a/Lib/distutils/command/config.py b/Lib/distutils/command/config.py
index 134fa38..b084913 100644
--- a/Lib/distutils/command/config.py
+++ b/Lib/distutils/command/config.py
@@ -11,7 +11,8 @@
__revision__ = "$Id$"
-import sys, os, re
+import os
+import re
from distutils.core import Command
from distutils.errors import DistutilsExecError
diff --git a/Lib/distutils/command/register.py b/Lib/distutils/command/register.py
index 3b5b208..fb547c9 100644
--- a/Lib/distutils/command/register.py
+++ b/Lib/distutils/command/register.py
@@ -7,12 +7,13 @@
__revision__ = "$Id$"
-import os, string, urllib2, getpass, urlparse
+import urllib2
+import getpass
+import urlparse
import StringIO
from warnings import warn
from distutils.core import PyPIRCCommand
-from distutils.errors import *
from distutils import log
class register(PyPIRCCommand):
diff --git a/Lib/distutils/command/sdist.py b/Lib/distutils/command/sdist.py
index 5c74e53..f1335e6 100644
--- a/Lib/distutils/command/sdist.py
+++ b/Lib/distutils/command/sdist.py
@@ -4,16 +4,17 @@
__revision__ = "$Id$"
-import os, string
+import os
+import string
import sys
-from types import *
from glob import glob
from warnings import warn
from distutils.core import Command
from distutils import dir_util, dep_util, file_util, archive_util
from distutils.text_file import TextFile
-from distutils.errors import *
+from distutils.errors import (DistutilsPlatformError, DistutilsOptionError,
+ DistutilsTemplateError)
from distutils.filelist import FileList
from distutils import log
from distutils.util import convert_path
@@ -256,7 +257,7 @@
standards = [('README', 'README.txt'), self.distribution.script_name]
for fn in standards:
- if type(fn) is TupleType:
+ if isinstance(fn, tuple):
alts = fn
got_it = 0
for fn in alts:
diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
index 5d6ebcf..3e18aea 100644
--- a/Lib/distutils/command/upload.py
+++ b/Lib/distutils/command/upload.py
@@ -1,7 +1,6 @@
"""distutils.command.upload
Implements the Distutils 'upload' subcommand (upload package to PyPI)."""
-import sys
import os
import socket
import platform
@@ -9,10 +8,9 @@
from base64 import standard_b64encode
import urlparse
import cStringIO as StringIO
-from ConfigParser import ConfigParser
from hashlib import md5
-from distutils.errors import *
+from distutils.errors import DistutilsOptionError
from distutils.core import PyPIRCCommand
from distutils.spawn import spawn
from distutils import log