pyuno/source/loader/pythonloader.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit dbbf20a4b40916ca4f5c98f18827ede39ad7a828
Author: Thomas Viehmann <t...@beamnet.de>
AuthorDate: Mon Apr 1 09:34:20 2019 +0200
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Tue Apr 2 09:22:03 2019 +0200
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.mehrbr...@cib.de>
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:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
