diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-08-30 11:46:45 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-08-30 11:46:45 +0200 |
| commit | 0390b3d1e5f7724692129d88e7a62c807bf6cbc6 (patch) | |
| tree | b7bdc1d9ae4811f573aaf0ff72a2e06acef496bb | |
| parent | 233cb6faea665f01f0a93698e7a5a54cd6858a64 (diff) | |
| download | Ishtar-0390b3d1e5f7724692129d88e7a62c807bf6cbc6.tar.bz2 Ishtar-0390b3d1e5f7724692129d88e7a62c807bf6cbc6.zip | |
Update secretary version
| -rwxr-xr-x | install/ishtar-install | 2 | ||||
| -rw-r--r-- | ishtar_common/utils_secretary.py | 6 | ||||
| -rw-r--r-- | requirements.txt | 2 |
3 files changed, 3 insertions, 7 deletions
diff --git a/install/ishtar-install b/install/ishtar-install index a29a4bfcf..a0d0b9d2a 100755 --- a/install/ishtar-install +++ b/install/ishtar-install @@ -516,7 +516,7 @@ EOF echo "-------------------------------------------------------------------------------"; cecho y "Installing python3-secretary" echo ""; - ( set -x; $sh_c 'pip3 install secretary==0.2.14' ) + ( set -x; $sh_c 'pip3 install secretary==0.2.19' ) cecho y "Installing weasyprint" echo ""; ( set -x; $sh_c 'pip3 install WeasyPrint==0.41' ) diff --git a/ishtar_common/utils_secretary.py b/ishtar_common/utils_secretary.py index 2266c38c3..972b7d223 100644 --- a/ishtar_common/utils_secretary.py +++ b/ishtar_common/utils_secretary.py @@ -2,11 +2,8 @@ # -*- coding: utf-8 -*- from secretary import Renderer, parseString - from xml.parsers.expat import ExpatError, ErrorString - - from datetime import datetime import locale from PIL import Image @@ -92,7 +89,6 @@ class IshtarSecretaryRenderer(Renderer): ) result = jinja_template.render(**kwargs) - result = self._encode_escape_chars(result) final_xml = parseString(result.encode('ascii', 'xmlcharrefreplace')) if self.template_images: @@ -107,6 +103,7 @@ class IshtarSecretaryRenderer(Renderer): near = result.split('\n')[e.lineno -1][e.offset-200:e.offset+200] except IndexError: near = "..." + print(result) ### endchanges raise ExpatError('ExpatError "%s" at line %d, column %d\nNear of: "[...]%s[...]"' % \ (ErrorString(e.code), e.lineno, e.offset, near)) @@ -118,4 +115,3 @@ class IshtarSecretaryRenderer(Renderer): raise finally: self.log.debug('Rendering xml object finished') - diff --git a/requirements.txt b/requirements.txt index bd90c1fb2..7bd55e33a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -28,7 +28,7 @@ django-compressor==2.1 django-formtools==2.0 -secretary==0.2.14 +secretary==0.2.19 unidecode virtualtime==1.6 # time for year before 1900 and before 1000 on python < 3.2 |