From a3d465a40c3eb1cb8c4ce9efbf7c8394fb19991b Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Sun, 18 Dec 2016 19:17:53 +0100 Subject: 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 Tested-by: Julien Nabet (cherry picked from commit 486efbfc74890582b16f858b8e937d4ae9b66f64) Reviewed-on: https://gerrit.libreoffice.org/74186 Reviewed-by: Michael Weghorn Tested-by: Michael Weghorn (cherry picked from commit 6459ec8046231e258d380efcdaac0a5def23276f) Conflicts: external/python3/ExternalPackage_python3.mk Change-Id: I1b5b0cb622eb9663d836b773d44a05efc9a59535 --- python3/ExternalPackage_python3.mk | 1 + scripting/source/pyprov/mailmerge.py | 1 + 2 files changed, 2 insertions(+) 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 -- cgit v1.2.3