Cleanup in packaging: super considered super

This commit is contained in:
Éric Araujo 2011-10-14 17:04:39 +02:00
parent d139b99426
commit 8022314fc2
8 changed files with 15 additions and 16 deletions

View File

@ -35,7 +35,7 @@ class PyDialog(Dialog):
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")

View File

@ -48,7 +48,7 @@ class BCPPCompiler(CCompiler) :
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

View File

@ -93,8 +93,7 @@ class CygwinCCompiler(UnixCCompiler):
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 @@ class CygwinCCompiler(UnixCCompiler):
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 @@ class Mingw32CCompiler(CygwinCCompiler):
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

View File

@ -310,7 +310,7 @@ class MSVCCompiler(CCompiler) :
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

View File

@ -237,7 +237,7 @@ class MSVCCompiler(CCompiler):
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":

View File

@ -28,8 +28,9 @@ try:
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))

View File

@ -103,7 +103,7 @@ class PyPIServer(threading.Thread):
"""
# 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:

View File

@ -65,7 +65,7 @@ class _TestHandler(logging.handlers.BufferingHandler):
# 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):