[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - external/python3 scripting/source

[Julien Nabet (via logerrit)]

 external/python3/ExternalPackage_python3.mk |    1 +
 scripting/source/pyprov/mailmerge.py        |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit 6459ec8046231e258d380efcdaac0a5def23276f
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sun Dec 18 19:17:53 2016 +0100
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Mon Jun 17 21:18:39 2019 +0200

    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 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 486efbfc74890582b16f858b8e937d4ae9b66f64)
    
    Change-Id: I071e9279d1de4748f9443ac2d624fe925288e408
    Reviewed-on: https://gerrit.libreoffice.org/74186
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    Tested-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/external/python3/ExternalPackage_python3.mk b/external/python3/ExternalPackage_python3.mk
index 0bde9ae68c8a..9da2ed4d1957 100644
--- a/external/python3/ExternalPackage_python3.mk
+++ b/external/python3/ExternalPackage_python3.mk
@@ -112,6 +112,7 @@ $(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-cor
 	LO_lib/_testcapi.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
 	LO_lib/_testimportmultiple.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
 	LO_lib/_testmultiphase.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
+	LO_lib/unicodedata.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
 	LO_lib/xxlimited.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
 	LO_lib/zlib.cpython-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m.so \
 ))
diff --git a/scripting/source/pyprov/mailmerge.py b/scripting/source/pyprov/mailmerge.py
index c8867aa796d1..235472b2a85d 100644
--- 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