summaryrefslogtreecommitdiff
path: root/pyuno
diff options
context:
space:
mode:
authorNiko Fink <libreoffice@niko.fink.bayern>2022-08-09 09:17:00 +0200
committerThorsten Behrens <thorsten.behrens@allotropia.de>2022-08-09 15:35:22 +0200
commitcd048ca7ab61718586f7ef5b48dccbb6bd38299c (patch)
treed0c34c17f814fe21eb34532dc41f351016881f8d /pyuno
parent594003edae99e02b4adef84c12595ace64e73bcd (diff)
tdf#133123: fix crash when importing defusedxml.ElementTree after pyuno
Change-Id: I89ac6108c679504c81dd9a439a4fb02e9e1adc07 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138007 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 1052ec9cff72e2810fdb934a85ab500d3b4ace35) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138018 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Diffstat (limited to 'pyuno')
-rw-r--r--pyuno/source/module/uno.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
index 5fa7b135736d..b2a75bd03982 100644
--- a/pyuno/source/module/uno.py
+++ b/pyuno/source/module/uno.py
@@ -365,6 +365,8 @@ def _uno_import(name, *optargs, **kwargs):
else:
# How to create a module ??
mod = pyuno.__class__(module)
+ if mod is None:
+ raise py_import_exc
d = mod.__dict__