source/text/sbasic/python/python_import.xhp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
New commits: commit d98542a85b40226fd2de5113ace424f8adee7618 Author: Alain Romedenne <alain.romede...@libreoffice.org> AuthorDate: Tue Apr 15 13:11:44 2025 +0200 Commit: Alain Romedenne <alain.romede...@libreoffice.org> CommitDate: Tue Apr 15 13:26:29 2025 +0200 more omissions in Python help - incl. code change Change-Id: Ifef19fdc11352355dead1fab7b4c6f21aaec8608 Reviewed-on: https://gerrit.libreoffice.org/c/help/+/184214 Reviewed-by: Alain Romedenne <alain.romede...@libreoffice.org> Tested-by: Jenkins diff --git a/source/text/sbasic/python/python_import.xhp b/source/text/sbasic/python/python_import.xhp index 1374561526..8eec99e20a 100644 --- a/source/text/sbasic/python/python_import.xhp +++ b/source/text/sbasic/python/python_import.xhp @@ -90,12 +90,14 @@ <paragraph role="pycode" localize="false" id="N0559"> return (module_name in sys.modules.keys())</paragraph> <paragraph role="pycode" localize="false" id="N0560"> def isLoadedLibrary(lib_name: str) -> bool:</paragraph> <paragraph role="pycode" xml-lang="en-US" id="N0561"> """ Check PYTHON_PATH content """</paragraph> - <paragraph role="pycode" localize="false" id="N0562"> return (lib_name in sys.path)</paragraph> + <paragraph role="pycode" localize="false" id="N0677"> url = uno.fileUrlToSystemPath(</paragraph> + <paragraph role="pycode" localize="false" id="N0678"> f'{doc.URL}/Scripts/python/{lib_name}' )</paragraph> + <paragraph role="pycode" localize="false" id="N0562"> return (url in sys.path)</paragraph> <paragraph role="pycode" localize="false" id="N0563"> def loadLibrary(lib_name: str, module_name=None):</paragraph> <paragraph role="pycode" xml-lang="en-US" id="N0564"> """ add directory to PYTHON_PATH, import named module """</paragraph> <paragraph role="pycode" localize="false" id="N0565"> doc = XSCRIPTCONTEXT.getDocument()</paragraph> <paragraph role="pycode" localize="false" id="N0566"> url = uno.fileUrlToSystemPath(</paragraph> - <paragraph role="pycode" localize="false" id="N0567"> '{}/{}'.format(doc.URL,'Scripts/python/'+lib_name))</paragraph> + <paragraph role="pycode" localize="false" id="N0567"> f'{doc.URL}/Scripts/python/{lib_name}' )</paragraph> <paragraph role="pycode" localize="false" id="N0568"> if not url in sys.path:</paragraph> <paragraph role="pycode" localize="false" id="N0569"> sys.path.insert(0, url)</paragraph> <paragraph role="pycode" localize="false" id="N0570"> if module_name and not module_name in sys.modules.keys():</paragraph> @@ -104,7 +106,7 @@ <paragraph role="pycode" xml-lang="en-US" id="N0573"> """ remove directory from PYTHON_PATH """</paragraph> <paragraph role="pycode" localize="false" id="N0665"> doc = XSCRIPTCONTEXT.getDocument()</paragraph> <paragraph role="pycode" localize="false" id="N0666"> url = uno.fileUrlToSystemPath(</paragraph> - <paragraph role="pycode" localize="false" id="N0667"> '{}/{}'.format(doc.URL,'Scripts/python/ '+lib_name))</paragraph> + <paragraph role="pycode" localize="false" id="N0667"> f'{doc.URL}/Scripts/python/{lib_name}' )</paragraph> <paragraph role="pycode" localize="false" id="N0574"> sys.path.remove(url)</paragraph> <paragraph role="pycode" localize="false" id="N0575"> </paragraph> <paragraph role="pycode" localize="false" id="N0576">g_exportedScripts = (OnDocPostOpenLoadPython, OnDocQueryCloseUnloadPython)</paragraph>