diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2016-12-18 19:17:53 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2016-12-18 22:00:42 +0000 |
| commit | adff04ce5149f5b4e9de235c19f5cc0d30a7d4e8 (patch) | |
| tree | 148263cf4d6cb49dd4ee1c430312212c04fad760 | |
| parent | 08091afa13e6ad7fc8da6d45339bdc46b6e7dbd2 (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!
Change-Id: I071e9279d1de4748f9443ac2d624fe925288e408
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/32145
| -rw-r--r-- | external/python3/ExternalPackage_python3.mk | 1 | ||||
| -rw-r--r-- | external/python33/ExternalPackage_python3.mk | 1 | ||||
| -rw-r--r-- | scripting/source/pyprov/mailmerge.py | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/external/python3/ExternalPackage_python3.mk b/external/python3/ExternalPackage_python3.mk index 045b4c194e2f..6cd766f8153f 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/external/python33/ExternalPackage_python3.mk b/external/python33/ExternalPackage_python3.mk index a2f51c10be18..9341e9c498f2 100644 --- a/external/python33/ExternalPackage_python3.mk +++ b/external/python33/ExternalPackage_python3.mk @@ -106,6 +106,7 @@ $(eval $(call gb_ExternalPackage_add_files,python3,$(LIBO_BIN_FOLDER)/python-cor 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 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 |