source/text/sbasic/python/python_import.xhp |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 49f57fc09c3b94850708dcaeb31b81d164e77229
Author:     Alain Romedenne <alain.romede...@libreoffice.org>
AuthorDate: Fri Apr 11 17:07:54 2025 +0200
Commit:     Alain Romedenne <alain.romede...@libreoffice.org>
CommitDate: Fri Apr 11 17:17:37 2025 +0200

    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.romede...@libreoffice.org>

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">    
&quot;&quot;&quot; Prepare Python modules import when doc. loaded 
&quot;&quot;&quot;</paragraph>
         <paragraph role="pycode" xml-lang="en-US" id="N0542">    
PythonLibraries.loadLibrary(&apos;lib/subdir&apos;)  # Add directory to search 
path </paragraph>
         <paragraph role="pycode" xml-lang="en-US" id="N0543">    
PythonLibraries.loadLibrary(&apos;my_gui&apos;, &apos;screen_io&apos;)  # Add 
dir. &amp; 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">    
&quot;&quot;&quot; Cleanup PYTHON_PATH when doc. Gets closed &quot;&quot;&quot; 
</paragraph>
         <paragraph role="pycode" xml-lang="en-US" id="N0547">    
PythonLibraries.unloadLibrary(&apos;my_gui&apos;)  # 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">        
&quot;&quot;&quot; add directory to PYTHON_PATH, import named module 
&quot;&quot;&quot;</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">            
&apos;{}/{}&apos;.format(doc.URL,&apos;Scripts/python/&apos;+lib_name)</paragraph>
+        <paragraph role="pycode" localize="false" id="N0567">            
&apos;{}/{}&apos;.format(doc.URL,&apos;Scripts/python/&apos;+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">        
&quot;&quot;&quot; remove directory from PYTHON_PATH 
&quot;&quot;&quot;</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">            
&apos;{}/{}&apos;.format(doc.URL,&apos;Scripts/python/ 
&apos;+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>

Reply via email to