summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-08-03 16:37:48 +0100
committerMichael Stahl <Michael.Stahl@cib.de>2019-08-07 12:46:54 +0200
commit599aaa5dab1d609fe4a0bd5d6b69dd0cc89cc11c (patch)
tree35e2f1dc47620e50df70a4faebc0c1394647742b
parentkeep pyuno script processing below base uri (diff)
downloadcore-599aaa5dab1d609fe4a0bd5d6b69dd0cc89cc11c.tar.gz
core-599aaa5dab1d609fe4a0bd5d6b69dd0cc89cc11c.zip
keep name percent-encoded
Change-Id: I470c4b24192c3e3c9b556a9bbb3b084359e0033b Reviewed-on: https://gerrit.libreoffice.org/77006 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 315c51731384230194af26b86a976bf5d06c9dcc)
-rw-r--r--scripting/source/pyprov/pythonscript.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripting/source/pyprov/pythonscript.py b/scripting/source/pyprov/pythonscript.py
index f5aa2173333a..7fd0a47fc57a 100644
--- a/scripting/source/pyprov/pythonscript.py
+++ b/scripting/source/pyprov/pythonscript.py
@@ -219,7 +219,9 @@ class MyUriHelper:
# path to the .py file + "$functionname, arguments, etc
xStorageUri = self.m_uriRefFac.parse(scriptURI)
- sStorageUri = xStorageUri.getName().replace( "|", "/" );
+ # getName will apply url-decoding to the name, so encode back
+ sStorageUri = xStorageUri.getName().replace("%", "%25")
+ sStorageUri = sStorageUri.replace( "|", "/" )
# path to the .py file, relative to the base
sFileUri = sStorageUri[0:sStorageUri.find("$")]