Cleanup in packaging: super considered super
diff --git a/Lib/packaging/command/bdist_msi.py b/Lib/packaging/command/bdist_msi.py
index eaeb458..9c1791f 100644
--- a/Lib/packaging/command/bdist_msi.py
+++ b/Lib/packaging/command/bdist_msi.py
@@ -35,7 +35,7 @@
def __init__(self, *args, **kw):
"""Dialog(database, name, x, y, w, h, attributes, title, first,
default, cancel, bitmap=true)"""
- Dialog.__init__(self, *args)
+ super(PyDialog, self).__init__(*args)
ruler = self.h - 36
#if kw.get("bitmap", True):
# self.bitmap("Bitmap", 0, 0, bmwidth, ruler, "PythonWin")
diff --git a/Lib/packaging/compiler/bcppcompiler.py b/Lib/packaging/compiler/bcppcompiler.py
index 477cf93..a4aa2fa 100644
--- a/Lib/packaging/compiler/bcppcompiler.py
+++ b/Lib/packaging/compiler/bcppcompiler.py
@@ -48,7 +48,7 @@
def __init__(self, verbose=0, dry_run=False, force=False):
- CCompiler.__init__(self, verbose, dry_run, force)
+ super(BCPPCompiler, self).__init__(verbose, dry_run, force)
# These executables are assumed to all be in the path.
# Borland doesn't seem to use any special registry settings to
diff --git a/Lib/packaging/compiler/cygwinccompiler.py b/Lib/packaging/compiler/cygwinccompiler.py
index 348dbe7..916a1cc 100644
--- a/Lib/packaging/compiler/cygwinccompiler.py
+++ b/Lib/packaging/compiler/cygwinccompiler.py
@@ -93,8 +93,7 @@
exe_extension = ".exe"
def __init__(self, verbose=0, dry_run=False, force=False):
-
- UnixCCompiler.__init__(self, verbose, dry_run, force)
+ super(CygwinCCompiler, self).__init__(verbose, dry_run, force)
status, details = check_config_h()
logger.debug("Python's GCC status: %s (details: %s)", status, details)
@@ -255,14 +254,14 @@
if ext not in (self.src_extensions + ['.rc','.res']):
raise UnknownFileError("unknown file type '%s' (from '%s')" % (ext, src_name))
if strip_dir:
- base = os.path.basename (base)
+ base = os.path.basename(base)
if ext in ('.res', '.rc'):
# these need to be compiled to object files
- obj_names.append (os.path.join(output_dir,
+ obj_names.append(os.path.join(output_dir,
base + ext + self.obj_extension))
else:
- obj_names.append (os.path.join(output_dir,
- base + self.obj_extension))
+ obj_names.append(os.path.join(output_dir,
+ base + self.obj_extension))
return obj_names
# the same as cygwin plus some additional parameters
@@ -273,8 +272,7 @@
description = 'MinGW32 compiler'
def __init__(self, verbose=0, dry_run=False, force=False):
-
- CygwinCCompiler.__init__ (self, verbose, dry_run, force)
+ super(Mingw32CCompiler, self).__init__(verbose, dry_run, force)
# ld_version >= "2.13" support -shared so use it instead of
# -mdll -static
diff --git a/Lib/packaging/compiler/msvc9compiler.py b/Lib/packaging/compiler/msvc9compiler.py
index 6ca49c2..539df73 100644
--- a/Lib/packaging/compiler/msvc9compiler.py
+++ b/Lib/packaging/compiler/msvc9compiler.py
@@ -310,7 +310,7 @@
exe_extension = '.exe'
def __init__(self, verbose=0, dry_run=False, force=False):
- CCompiler.__init__(self, verbose, dry_run, force)
+ super(MSVCCompiler, self).__init__(verbose, dry_run, force)
self.__version = VERSION
self.__root = r"Software\Microsoft\VisualStudio"
# self.__macros = MACROS
diff --git a/Lib/packaging/compiler/msvccompiler.py b/Lib/packaging/compiler/msvccompiler.py
index 3d4ac3c..740bc30 100644
--- a/Lib/packaging/compiler/msvccompiler.py
+++ b/Lib/packaging/compiler/msvccompiler.py
@@ -237,7 +237,7 @@
exe_extension = '.exe'
def __init__(self, verbose=0, dry_run=False, force=False):
- CCompiler.__init__(self, verbose, dry_run, force)
+ super(MSVCCompiler, self).__init__(verbose, dry_run, force)
self.__version = get_build_version()
self.__arch = get_build_architecture()
if self.__arch == "Intel":
diff --git a/Lib/packaging/metadata.py b/Lib/packaging/metadata.py
index c13acbe..9d3f8ab 100644
--- a/Lib/packaging/metadata.py
+++ b/Lib/packaging/metadata.py
@@ -28,8 +28,9 @@
def __init__(self, source, report_level, halt_level, stream=None,
debug=0, encoding='ascii', error_handler='replace'):
self.messages = []
- Reporter.__init__(self, source, report_level, halt_level, stream,
- debug, encoding, error_handler)
+ super(SilentReporter, self).__init__(
+ source, report_level, halt_level, stream,
+ debug, encoding, error_handler)
def system_message(self, level, message, *children, **kwargs):
self.messages.append((level, message, children, kwargs))
diff --git a/Lib/packaging/tests/pypi_server.py b/Lib/packaging/tests/pypi_server.py
index 72cf8be..377a2b9 100644
--- a/Lib/packaging/tests/pypi_server.py
+++ b/Lib/packaging/tests/pypi_server.py
@@ -103,7 +103,7 @@
"""
# we want to launch the server in a new dedicated thread, to not freeze
# tests.
- threading.Thread.__init__(self)
+ super(PyPIServer, self).__init__()
self._run = True
self._serve_xmlrpc = serve_xmlrpc
if static_filesystem_paths is None:
diff --git a/Lib/packaging/tests/support.py b/Lib/packaging/tests/support.py
index 33d5966..cfcfe01 100644
--- a/Lib/packaging/tests/support.py
+++ b/Lib/packaging/tests/support.py
@@ -65,7 +65,7 @@
# stolen and adapted from test.support
def __init__(self):
- logging.handlers.BufferingHandler.__init__(self, 0)
+ super(_TestHandler, self).__init__(0)
self.setLevel(logging.DEBUG)
def shouldFlush(self):