Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-31 14:33:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use keyword args in all container inits for consistency

Browse Source
This commit is contained in:
Kovid Goyal 2025-04-06 21:03:47 +05:30
parent 69adb0ae81
commit 78314795f4
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/ebooks/oeb/polish/container.py
View File

@ -234,7 +234,7 @@ class Container(ContainerBase): # {{{
return self.book_type.upper() return self.book_type.upper()
def __init__(self, rootpath=None, opfpath=None, log=default_log, clone_data=None): def __init__(self, rootpath=None, opfpath=None, log=default_log, clone_data=None):
ContainerBase.__init__(self, log) super().__init__(log=log)
self.root = clone_data['root'] if clone_data is not None else os.path.abspath(rootpath) self.root = clone_data['root'] if clone_data is not None else os.path.abspath(rootpath)
self.name_path_map = {} self.name_path_map = {}
@ -1160,7 +1160,7 @@ class EpubContainer(Container):
def __init__(self, pathtoepub=None, log=default_log, clone_data=None, tdir=None): def __init__(self, pathtoepub=None, log=default_log, clone_data=None, tdir=None):
if clone_data is not None: if clone_data is not None:
super().__init__(None, None, log, clone_data=clone_data) super().__init__(log=log, clone_data=clone_data)
for x in ('pathtoepub', 'obfuscated_fonts', 'is_dir'): for x in ('pathtoepub', 'obfuscated_fonts', 'is_dir'):
setattr(self, x, clone_data[x]) setattr(self, x, clone_data[x])
return return
@ -1223,7 +1223,7 @@ class EpubContainer(Container):
raise InvalidEpub('OPF file does not exist at location pointed to' raise InvalidEpub('OPF file does not exist at location pointed to'
' by META-INF/container.xml') ' by META-INF/container.xml')
super().__init__(tdir, opf_path, log) super().__init__(rootpath=tdir, opfpath=opf_path, log=log)
self.obfuscated_fonts = {} self.obfuscated_fonts = {}
if 'META-INF/encryption.xml' in self.name_path_map: if 'META-INF/encryption.xml' in self.name_path_map:
@ -1539,7 +1539,7 @@ class AZW3Container(Container):
def __init__(self, pathtoazw3=None, log=default_log, clone_data=None, tdir=None): def __init__(self, pathtoazw3=None, log=default_log, clone_data=None, tdir=None):
if clone_data is not None: if clone_data is not None:
super().__init__(None, None, log, clone_data=clone_data) super().__init__(log=log, clone_data=clone_data)
for x in ('pathtoazw3', 'obfuscated_fonts'): for x in ('pathtoazw3', 'obfuscated_fonts'):
setattr(self, x, clone_data[x]) setattr(self, x, clone_data[x])
return return
@ -1582,7 +1582,7 @@ class AZW3Container(Container):
except WorkerError as e: except WorkerError as e:
log(e.orig_tb) log(e.orig_tb)
raise InvalidMobi('Failed to explode MOBI') raise InvalidMobi('Failed to explode MOBI')
super().__init__(tdir, opf_path, log) super().__init__(rootpath=tdir, opfpath=opf_path, log=log)
self.obfuscated_fonts = {x.replace(os.sep, '/') for x in obfuscated_fonts} self.obfuscated_fonts = {x.replace(os.sep, '/') for x in obfuscated_fonts}
def data_for_clone(self, dest_dir=None): def data_for_clone(self, dest_dir=None):