Skip to content

Commit 3358465

Browse files
t-8cht-8ch
committed
treewide: unify calls to super methods
super() has various advantages over its open-coded variants. It * always picks the correct superclass * has obvious semantics * needs less characters Signed-off-by: Thomas Weißschuh <[email protected]>
1 parent 459f431 commit 3358465

24 files changed

+76
-121
lines changed

‎elbepack/aptpkgutils.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -265,13 +265,13 @@ def __init__(self, pkg, cache=None):
265265
else:
266266
self.installed_deb = None
267267

268-
PackageBase.__init__(self, pkg.name,
269-
iver, cver,
270-
ihashes, chashes,
271-
iprio, cprio,
272-
iarch, carch,
273-
pkgstate(pkg), pkg.is_auto_installed,
274-
origin)
268+
super().__init__(pkg.name,
269+
iver, cver,
270+
ihashes, chashes,
271+
iprio, cprio,
272+
iarch, carch,
273+
pkgstate(pkg), pkg.is_auto_installed,
274+
origin)
275275

276276

277277
class XMLPackage(PackageBase):
@@ -288,10 +288,10 @@ def __init__(self, node):
288288
site=None,
289289
component=None)
290290

291-
PackageBase.__init__(self, node.et.text,
292-
node.et.get('version'), None,
293-
hashes, None,
294-
node.et.get('prio'), None,
295-
node.et.get('arch'), None,
296-
INSTALLED, node.et.get('auto') == 'true',
297-
origin)
291+
super().__init__(node.et.text,
292+
node.et.get('version'), None,
293+
hashes, None,
294+
node.et.get('prio'), None,
295+
node.et.get('arch'), None,
296+
INSTALLED, node.et.get('auto') == 'true',
297+
origin)

‎elbepack/aptprogress.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
class ElbeInstallProgress (InstallProgress):
1313

1414
def __init__(self, cb=None, fileno=2):
15-
InstallProgress.__init__(self)
15+
super().__init__()
1616
self.cb = cb
1717
self.fileno = fileno
1818

@@ -65,7 +65,7 @@ def finishUpdate(self):
6565
class ElbeAcquireProgress (AcquireProgress):
6666

6767
def __init__(self, cb=None):
68-
AcquireProgress.__init__(self)
68+
super().__init__()
6969
self._id = 1
7070
self.cb = cb
7171

@@ -105,7 +105,7 @@ def pulse(_owner):
105105
class ElbeOpProgress (OpProgress):
106106

107107
def __init__(self, cb=None):
108-
OpProgress.__init__(self)
108+
super().__init__()
109109
self._id = 1
110110
self.cb = cb
111111

‎elbepack/asyncworker.py‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def enqueue(self, queue, db):
3737
['empty_project', 'needs_build', 'has_changes',
3838
'build_done', 'build_failed'])
3939
logging.info('Enqueueing project for building sysroot')
40-
AsyncWorkerJob.enqueue(self, queue, db)
40+
super().enqueue(queue, db)
4141

4242
def execute(self, db):
4343
success = self.build_failed
@@ -65,7 +65,7 @@ def enqueue(self, queue, db):
6565
['empty_project', 'needs_build', 'has_changes',
6666
'build_done', 'build_failed'])
6767
logging.info('Enqueueing project for building SDK')
68-
AsyncWorkerJob.enqueue(self, queue, db)
68+
super().enqueue(queue, db)
6969

7070
def execute(self, db):
7171
success = self.build_failed
@@ -87,7 +87,7 @@ def execute(self, db):
8787

8888
class BuildCDROMsJob(AsyncWorkerJob):
8989
def __init__(self, project, build_bin, build_src):
90-
AsyncWorkerJob.__init__(self, project)
90+
super().__init__(project)
9191
self.build_bin = build_bin
9292
self.build_src = build_src
9393

@@ -96,7 +96,7 @@ def enqueue(self, queue, db):
9696
['empty_project', 'needs_build', 'has_changes',
9797
'build_done', 'build_failed'])
9898
logging.info('Enqueueing project for building CDROMs')
99-
AsyncWorkerJob.enqueue(self, queue, db)
99+
super().enqueue(queue, db)
100100

101101
def execute(self, db):
102102
success = self.build_failed
@@ -123,7 +123,7 @@ def enqueue(self, queue, db):
123123
['empty_project', 'needs_build', 'has_changes',
124124
'build_done', 'build_failed'])
125125
logging.info('Enqueueing project for building croot tar')
126-
AsyncWorkerJob.enqueue(self, queue, db)
126+
super().enqueue(queue, db)
127127

128128
def execute(self, db):
129129
success = self.build_failed
@@ -145,7 +145,7 @@ def execute(self, db):
145145

146146
class BuildJob(AsyncWorkerJob):
147147
def __init__(self, project, build_bin, build_src, skip_pbuilder):
148-
AsyncWorkerJob.__init__(self, project)
148+
super().__init__(project)
149149
self.build_bin = build_bin
150150
self.build_src = build_src
151151
self.skip_pbuilder = skip_pbuilder
@@ -155,7 +155,7 @@ def enqueue(self, queue, db):
155155
['empty_project', 'needs_build', 'has_changes',
156156
'build_done', 'build_failed'])
157157
logging.info('Enqueueing project for build')
158-
AsyncWorkerJob.enqueue(self, queue, db)
158+
super().enqueue(queue, db)
159159

160160
def execute(self, db):
161161

@@ -193,7 +193,7 @@ def execute(self, db):
193193

194194
class PdebuildJob(AsyncWorkerJob):
195195
def __init__(self, project, profile='', cross=False):
196-
AsyncWorkerJob.__init__(self, project)
196+
super().__init__(project)
197197
self.profile = profile
198198
self.cross = cross
199199

@@ -202,7 +202,7 @@ def enqueue(self, queue, db):
202202
['empty_project', 'needs_build', 'has_changes',
203203
'build_done', 'build_failed'])
204204
logging.info('Enqueueing project for pdebuild')
205-
AsyncWorkerJob.enqueue(self, queue, db)
205+
super().enqueue(queue, db)
206206

207207
def execute(self, db):
208208
success = self.build_failed
@@ -224,7 +224,7 @@ def execute(self, db):
224224

225225
class CreatePbuilderJob(AsyncWorkerJob):
226226
def __init__(self, project, ccachesize, cross=False, noccache=False):
227-
AsyncWorkerJob.__init__(self, project)
227+
super().__init__(project)
228228
self.cross = cross
229229
self.noccache = noccache
230230
self.ccachesize = ccachesize
@@ -234,7 +234,7 @@ def enqueue(self, queue, db):
234234
['empty_project', 'needs_build', 'has_changes',
235235
'build_done', 'build_failed'])
236236
logging.info('Enqueueing project to have the pbuilder built')
237-
AsyncWorkerJob.enqueue(self, queue, db)
237+
super().enqueue(queue, db)
238238

239239
def execute(self, db):
240240
success = self.build_failed
@@ -259,7 +259,7 @@ def enqueue(self, queue, db):
259259
['empty_project', 'needs_build', 'has_changes',
260260
'build_done', 'build_failed'])
261261
logging.info('Enqueueing project to update the pbuilder')
262-
AsyncWorkerJob.enqueue(self, queue, db)
262+
super().enqueue(queue, db)
263263

264264
def execute(self, db):
265265
success = self.build_done
@@ -290,7 +290,7 @@ def savecwd():
290290

291291
class AsyncWorker(Thread):
292292
def __init__(self, db):
293-
Thread.__init__(self, name='AsyncWorker')
293+
super().__init__(name='AsyncWorker')
294294
self.db = db
295295
self.queue = Queue()
296296
self.start()

‎elbepack/commands/parselicence.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
class license_dep5_to_spdx (dict):
1818
def __init__(self, xml_fname=None):
19-
dict.__init__(self)
19+
super().__init__()
2020

2121
self.perpackage_mapping = {}
2222
self.perpackage_override = {}

‎elbepack/daemons/soap/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
class EsoapApp(Application):
2929
def __init__(self, *args, **kargs):
30-
Application.__init__(self, *args, **kargs)
30+
super().__init__(*args, **kargs)
3131
self.pm = ProjectManager('/var/cache/elbe')
3232

3333

‎elbepack/daemons/soap/authentication.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,15 @@
99

1010
class SoapElbeNotLoggedIn(Fault):
1111
def __init__(self):
12-
Fault.__init__(
13-
self,
12+
super().__init__(
1413
faultcode='ElbeNotLoggedIn',
1514
faultstring='Not authenticated ! '
1615
'Cant let you perform this command.')
1716

1817

1918
class SoapElbeNotAuthorized(Fault):
2019
def __init__(self):
21-
Fault.__init__(
22-
self,
20+
super().__init__(
2321
faultcode='ElbeNotAuthorized',
2422
faultstring='Not Authorized ! Cant let you perform this command.')
2523

‎elbepack/daemons/soap/esoap.py‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,29 +27,23 @@
2727

2828
class SoapElbeDBError(Fault):
2929
def __init__(self, dberr):
30-
Fault.__init__(self, faultcode='ElbeDBError', faultstring=str(dberr))
30+
super().__init__(faultcode='ElbeDBError', faultstring=str(dberr))
3131

3232

3333
class SoapElbeProjectError(Fault):
3434
def __init__(self, err):
35-
Fault.__init__(
36-
self,
37-
faultcode='ElbeProjectError',
38-
faultstring=str(err))
35+
super().__init__(faultcode='ElbeProjectError', faultstring=str(err))
3936

4037

4138
class SoapElbeValidationError(Fault):
4239
def __init__(self, exc):
43-
Fault.__init__(
44-
self,
45-
faultcode='ElbeValidationError',
46-
faultstring=exc.__repr__())
40+
super().__init__(faultcode='ElbeValidationError', faultstring=exc.__repr__())
4741

4842

4943
class SoapElbeInvalidState(Fault):
5044
def __init__(self):
51-
Fault.__init__(self, faultcode='ElbeInvalidState',
52-
faultstring='Project is Busy ! Operation Invalid')
45+
super().__init__(faultcode='ElbeInvalidState',
46+
faultstring='Project is Busy ! Operation Invalid')
5347

5448

5549
class ESoap (ServiceBase):

‎elbepack/db.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,12 @@ class Base(metaclass=DeclarativeMeta):
5050

5151

5252
class ElbeDBError(Exception):
53-
def __init__(self, message):
54-
Exception.__init__(self, message)
53+
pass
5554

5655

5756
class InvalidLogin(Exception):
5857
def __init__(self):
59-
Exception.__init__(self, 'Invalid login')
58+
super().__init__('Invalid login')
6059

6160

6261
@contextmanager

‎elbepack/debinstaller.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class NoKinitrdException(Exception):
2929
class ReleaseFile(HashValidator):
3030
def __init__(self, base_url, fname, fname_list):
3131

32-
HashValidator.__init__(self, base_url)
32+
super().__init__(base_url)
3333

3434
header_re = re.compile(r'(\w+):(.*)')
3535
hash_re = re.compile(r' ([0-9a-f]+)\s+([0-9]+)\s+(\S+)')
@@ -57,7 +57,7 @@ def __init__(self, base_url, fname, fname_list):
5757
class SHA256SUMSFile(HashValidator):
5858
def __init__(self, base_url, fname, fname_list):
5959

60-
HashValidator.__init__(self, base_url)
60+
super().__init__(base_url)
6161

6262
hash_re = re.compile(r'([0-9a-f]+)\s+(\S+)')
6363

‎elbepack/efilesystem.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,7 +301,7 @@ def _undo_excursion(self, rfs):
301301
class ChRootFilesystem(ElbeFilesystem):
302302

303303
def __init__(self, path, interpreter=None, clean=False):
304-
ElbeFilesystem.__init__(self, path, clean)
304+
super().__init__(path, clean)
305305
self.interpreter = interpreter
306306
self.cwd = os.open('/', os.O_RDONLY)
307307
self.inchroot = False
@@ -387,7 +387,7 @@ def leave_chroot(self):
387387

388388
class TargetFs(ChRootFilesystem):
389389
def __init__(self, path, xml, clean=True):
390-
ChRootFilesystem.__init__(self, path, xml.defs['userinterpr'], clean)
390+
super().__init__(path, xml.defs['userinterpr'], clean)
391391
self.xml = xml
392392
self.images = []
393393
self.image_packers = {}

0 commit comments

Comments
 (0)