summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2016-12-18 19:17:53 +0100
committerMichael Weghorn <m.weghorn@posteo.de>2019-06-18 13:25:25 +0000
commita3d465a40c3eb1cb8c4ce9efbf7c8394fb19991b (patch)
treee7087574d095cee7c15b791e9a2b7210d6980596
parentcd3559a850bb3999de339da0855d34c643143004 (diff)
tdf#103363: add unicodedata and import idna encoding for mailmerge
Thank you Moggi for your help on how to add unicodedata module to Python! Reviewed-on: https://gerrit.libreoffice.org/32140 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr> (cherry picked from commit 486efbfc74890582b16f858b8e937d4ae9b66f64) Reviewed-on: https://gerrit.libreoffice.org/74186 Reviewed-by: Michael Weghorn <m.weghorn@posteo.de> Tested-by: Michael Weghorn <m.weghorn@posteo.de> (cherry picked from commit 6459ec8046231e258d380efcdaac0a5def23276f) Conflicts: external/python3/ExternalPackage_python3.mk Change-Id: I1b5b0cb622eb9663d836b773d44a05efc9a59535
-rw-r--r--python3/ExternalPackage_python3.mk1
-rwxr-xr-xscripting/source/pyprov/mailmerge.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/python3/ExternalPackage_python3.mk b/python3/ExternalPackage_python3.mk
index 3a36d4e33fde..ed758725e7d3 100644
--- a/python3/ExternalPackage_python3.mk
+++ b/python3/ExternalPackage_python3.mk
@@ -109,6 +109,7 @@ $(eval $(call gb_ExternalPackage_add_files,python3,$(gb_Package_PROGRAMDIRNAME)/
LO_lib/_testbuffer.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
LO_lib/_testcapi.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
LO_lib/time.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
+ LO_lib/unicodedata.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
LO_lib/zlib.cpython-$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR)m.so \
))
endif
diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py
index 3cfb6d3175eb..e0dd1b5154f6 100755
--- a/scripting/source/pyprov/mailmerge.py
+++ b/scripting/source/pyprov/mailmerge.py
@@ -17,6 +17,7 @@ import unohelper
import uno
import re
import os
+import encodings.idna
#to implement com::sun::star::mail::XMailServiceProvider
#and