Date: Fri, 8 Mar 2019 06:46:28 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495018 - in head/textproc/itstool: . files Message-ID: <201903080646.x286kSdj075542@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Fri Mar 8 06:46:27 2019 New Revision: 495018 URL: https://svnweb.freebsd.org/changeset/ports/495018 Log: Workaround https://github.com/itstool/itstool/issues/25 Reported by: pkg-fallout Obtained from: Fedora Added: head/textproc/itstool/files/ head/textproc/itstool/files/patch-itstool.in (contents, props changed) Modified: head/textproc/itstool/Makefile Modified: head/textproc/itstool/Makefile ============================================================================== --- head/textproc/itstool/Makefile Fri Mar 8 04:37:34 2019 (r495017) +++ head/textproc/itstool/Makefile Fri Mar 8 06:46:27 2019 (r495018) @@ -4,7 +4,7 @@ PORTNAME= itstool PORTVERSION= 2.0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= http://files.itstool.org/itstool/ Added: head/textproc/itstool/files/patch-itstool.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/itstool/files/patch-itstool.in Fri Mar 8 06:46:27 2019 (r495018) @@ -0,0 +1,52 @@ +# Workaround https://github.com/itstool/itstool/issues/25 +# Obtained from Fedora + +--- itstool.in.orig 2018-08-21 15:27:24 UTC ++++ itstool.in +@@ -44,9 +44,22 @@ if PY3: + else: + return str(s) + ustr_type = str ++ def pr_str(s): ++ """Return a string that can be safely print()ed""" ++ # Since print works on both bytes and unicode, just return the argument ++ return s + else: + string_types = basestring, + ustr = ustr_type = unicode ++ def pr_str(s): ++ """Return a string that can be safely print()ed""" ++ if isinstance(s, str): ++ # Since print works on str, just return the argument ++ return s ++ else: ++ # print may not work on unicode if the output encoding cannot be ++ # detected, so just encode with UTF-8 ++ return unicode.encode(s, 'utf-8') + + NS_ITS = 'http://www.w3.org/2005/11/its' + NS_ITST = 'http://itstool.org/extensions/' +@@ -1060,9 +1073,9 @@ class Document (object): + if strict: + raise + else: +- sys.stderr.write('Warning: Could not merge %stranslation for msgid:\n%s\n' % ( ++ sys.stderr.write(pr_str('Warning: Could not merge %stranslation for msgid:\n%s\n' % ( + (lang + ' ') if lang is not None else '', +- msgstr.encode('utf-8'))) ++ msgstr))) + self._xml_err = '' + return node + def scan_node(node): +@@ -1087,9 +1100,9 @@ class Document (object): + if strict: + raise + else: +- sys.stderr.write('Warning: Could not merge %stranslation for msgid:\n%s\n' % ( ++ sys.stderr.write(pr_str('Warning: Could not merge %stranslation for msgid:\n%s\n' % ( + (lang + ' ') if lang is not None else '', +- msgstr.encode('utf-8'))) ++ msgstr))) + self._xml_err = '' + ctxt.doc().freeDoc() + return node
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903080646.x286kSdj075542>