diff options
| author | Thomas Viehmann <tv@beamnet.de> | 2019-04-01 09:34:20 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-04-02 12:15:01 +0200 |
| commit | 71295a9d41a4e0f8b01c74ebf586fc2c15babfd2 (patch) | |
| tree | db92c6d6a9e9af980daeb9d5c2b702262203f2d8 /pyuno | |
| parent | Resolves: tdf#124440 nospin has no subedit (diff) | |
| download | core-71295a9d41a4e0f8b01c74ebf586fc2c15babfd2.tar.gz core-71295a9d41a4e0f8b01c74ebf586fc2c15babfd2.zip | |
For Python extensions, set __file__ before executing the module
Previously __file__ was set after executing the module. This meant,
however that it was not available during execution.
This patch moves setting __file__ before the execution.
As __file__ is a string (and not bytes), we remove the encoding.
Change-Id: I63fe34b6f5d30f53aab16627d413c87b9de81992
Reviewed-on: https://gerrit.libreoffice.org/70048
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
(cherry picked from commit dbbf20a4b40916ca4f5c98f18827ede39ad7a828)
Reviewed-on: https://gerrit.libreoffice.org/70119
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/source/loader/pythonloader.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pyuno/source/loader/pythonloader.py b/pyuno/source/loader/pythonloader.py index ddb9001fc0e6..268cb168fe3c 100644 --- a/pyuno/source/loader/pythonloader.py +++ b/pyuno/source/loader/pythonloader.py @@ -100,8 +100,8 @@ class Loader( XImplementationLoader, XServiceInfo, unohelper.Base ): # compile and execute the module codeobject = compile( src, encfile(filename), "exec" ) + mod.__file__ = filename exec(codeobject, mod.__dict__) - mod.__file__ = encfile(filename) g_loadedComponents[url] = mod return mod elif "vnd.openoffice.pymodule" == protocol: |