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

When loading code from plugins load as bytes

Browse Source 
This is closer to how the python interpreter does it
This commit is contained in:
Kovid Goyal 2020-10-03 14:17:25 +05:30
parent 0d3a80e850
commit 0e25387a9f
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/calibre/customize/zipplugin.py
View File

@ -147,7 +147,7 @@ class CalibrePluginLoader:
def is_package(self, fullname): def is_package(self, fullname):
return self._is_package return self._is_package
def get_source(self, fullname=None): def get_source_as_bytes(self, fullname=None):
src = b'' src = b''
if self.plugin_name and self.fullname_in_plugin and self.zip_file_path: if self.plugin_name and self.fullname_in_plugin and self.zip_file_path:
zinfo = self.names.get(self.fullname_in_plugin) zinfo = self.names.get(self.fullname_in_plugin)
@ -158,13 +158,16 @@ class CalibrePluginLoader:
except Exception: except Exception:
# Maybe the zip file changed from under us # Maybe the zip file changed from under us
src = zf.read(zinfo.filename) src = zf.read(zinfo.filename)
return src.decode('utf-8-sig').replace('\r\n', '\n') return src
def get_source(self, fullname=None):
return self.get_source_as_bytes(fullname).decode('utf-8-sig').replace('\r\n', '\n')
def get_filename(self, fullname): def get_filename(self, fullname):
return self.filename return self.filename
def get_code(self, fullname=None): def get_code(self, fullname=None):
return compile(self.get_source(fullname), f'calibre_plugins.{self.plugin_name}.{self.fullname_in_plugin}', return compile(self.get_source_as_bytes(fullname), f'calibre_plugins.{self.plugin_name}.{self.fullname_in_plugin}',
'exec', dont_inherit=True) 'exec', dont_inherit=True)
def exec_module(self, module): def exec_module(self, module):