diff options
| author | Maurits van Rees <maurits@vanrees.org> | 2013-09-21 23:38:21 +0200 |
|---|---|---|
| committer | Maurits van Rees <maurits@vanrees.org> | 2013-09-21 23:41:30 +0200 |
| commit | be256b9f90a18bf18d72554ee7167d1093306505 (patch) | |
| tree | 77d0103c1e71cab681a2086db4d8df42820c415d | |
| parent | 98cd8bbd446b209367f8353b9c7a90216e173a12 (diff) | |
| download | zope-tal-be256b9f90a18bf18d72554ee7167d1093306505.tar.gz | |
Fix warning of msgid with different default for Python 3.
| -rw-r--r-- | src/zope/tal/talgettext.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/zope/tal/talgettext.py b/src/zope/tal/talgettext.py index 233751e..91c72e8 100644 --- a/src/zope/tal/talgettext.py +++ b/src/zope/tal/talgettext.py @@ -134,10 +134,16 @@ class POEngine(DummyEngine): existing_msgid = msgids[idx] if msgid.default != existing_msgid.default: references = '\n'.join([location[0]+':'+str(location[1]) for location in domain[msgid]]) + # Note: a lot of encode calls here are needed so Python 3 does not break. print(("Warning: msgid '%s' in %s already exists " "with a different default (bad: %s, should be: %s)\n" - "The references for the existent value are:\n%s\n".encode('utf-8') % - (msgid.encode('utf-8'), self.file+':'+str(position), msgid.default.encode('utf-8'), existing_msgid.default.encode('utf-8'), references)), file=sys.stderr) + "The references for the existent value are:\n%s\n" % + (msgid.encode('utf-8'), + self.file.encode('utf-8') + ':'.encode('utf-8') + str(position).encode('utf-8'), + msgid.default.encode('utf-8'), + existing_msgid.default.encode('utf-8'), + references.encode('utf-8'))), + file=sys.stderr) domain[msgid].append((self.file, position)) return 'x' |