diff options
| author | Alain Romedenne <alain.romedenne@libreoffice.org> | 2025-04-11 17:07:54 +0200 |
|---|---|---|
| committer | Alain Romedenne <alain.romedenne@libreoffice.org> | 2025-04-11 17:17:37 +0200 |
| commit | 49f57fc09c3b94850708dcaeb31b81d164e77229 (patch) | |
| tree | a85e053e1830b3a8b317ccbf27f9c9f2042c43c3 /source/text/sbasic | |
| parent | eeb6c27c4dd07cb9ea7c843ec278e3385d64ed97 (diff) | |
multiple omissions/bugs in Python help
Change-Id: I92603f09f832d11720112b129445a74c2f2d63ee
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/184055
Tested-by: Jenkins
Reviewed-by: Alain Romedenne <alain.romedenne@libreoffice.org>
Diffstat (limited to 'source/text/sbasic')
| -rw-r--r-- | source/text/sbasic/python/python_import.xhp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source/text/sbasic/python/python_import.xhp b/source/text/sbasic/python/python_import.xhp index 850d3e35cc..1374561526 100644 --- a/source/text/sbasic/python/python_import.xhp +++ b/source/text/sbasic/python/python_import.xhp @@ -68,14 +68,14 @@ <paragraph role="pycode" localize="false" id="N0536"># -*- coding: utf-8 -*-</paragraph> <paragraph role="pycode" localize="false" id="N0533">from __future__ import unicode_literals</paragraph> <paragraph role="pycode" localize="false" id="N0537"> </paragraph> - <paragraph role="pycode" localize="false" id="N0538">import sys, uno</paragraph> + <paragraph role="pycode" localize="false" id="N0538">import sys, uno, zipimport</paragraph> <paragraph role="pycode" localize="false" id="N0539"> </paragraph> - <paragraph role="pycode" localize="false" id="N0540">def OnDocPostOpenLoadPython():</paragraph> + <paragraph role="pycode" localize="false" id="N0540">def OnDocPostOpenLoadPython(event = None):</paragraph> <paragraph role="pycode" xml-lang="en-US" id="N0541"> """ Prepare Python modules import when doc. loaded """</paragraph> <paragraph role="pycode" xml-lang="en-US" id="N0542"> PythonLibraries.loadLibrary('lib/subdir') # Add directory to search path </paragraph> <paragraph role="pycode" xml-lang="en-US" id="N0543"> PythonLibraries.loadLibrary('my_gui', 'screen_io') # Add dir. & import screen_io</paragraph> <paragraph role="pycode" localize="false" id="N0544"> </paragraph> - <paragraph role="pycode" localize="false" id="N0545">def OnDocQueryCloseUnloadPython():</paragraph> + <paragraph role="pycode" localize="false" id="N0545">def OnDocQueryCloseUnloadPython(event = None):</paragraph> <paragraph role="pycode" xml-lang="en-US" id="N0546"> """ Cleanup PYTHON_PATH when doc. Gets closed """ </paragraph> <paragraph role="pycode" xml-lang="en-US" id="N0547"> PythonLibraries.unloadLibrary('my_gui') # Python runtime path cleanup</paragraph> <paragraph role="pycode" xml-lang="en-US" id="N0548"> # Note: imported modules remain loaded in this example.</paragraph> @@ -95,14 +95,17 @@ <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"> '{}/{}'.format(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> <paragraph role="pycode" localize="false" id="N0571"> return zipimport.zipimporter(url).load_module(module_name)</paragraph> <paragraph role="pycode" localize="false" id="N0572"> def unloadLibrary(lib_name: str):</paragraph> <paragraph role="pycode" xml-lang="en-US" id="N0573"> """ remove directory from PYTHON_PATH """</paragraph> - <paragraph role="pycode" localize="false" id="N0574"> sys.path.remove(lib_name)</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="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> </pycode> |