diff options
-rwxr-xr-x | solenv/bin/hrcex | 13 | ||||
-rw-r--r-- | solenv/bin/polib.py | 2 | ||||
-rwxr-xr-x | solenv/bin/uiex | 10 |
3 files changed, 13 insertions, 12 deletions
diff --git a/solenv/bin/hrcex b/solenv/bin/hrcex index 1c371a1ed48e..49966dc7e167 100755 --- a/solenv/bin/hrcex +++ b/solenv/bin/hrcex @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python3 import polib import binascii @@ -22,17 +22,18 @@ for o, a in myopts: ofile = a with open(ofile, "a") as output: - xgettext = Popen(["xgettext", "-C", "--add-comments", "--keyword=NC_:1c,2", "--keyword=NNC_:1c,2,3", "--from-code=UTF-8", "--no-wrap", ifile, "-o", "-"], stdout=PIPE) + xgettext = Popen(["xgettext", "-C", "--add-comments", "--keyword=NC_:1c,2", "--keyword=NNC_:1c,2,3", "--from-code=UTF-8", "--no-wrap", ifile, "-o", "-"], stdout=PIPE, encoding="UTF-8") # while overall format is c++, all of the strings use custom placeholders and don't follow c-format # esp. plain percent sign never is escaped explicitly - input = check_output(['sed', '-e', '/^#, c-format$/d'], stdin=xgettext.stdout) + input = check_output(['sed', '-e', '/^#, c-format$/d'], stdin=xgettext.stdout, encoding="UTF-8") xgettext.wait() + xgettext.stdout.close() po = polib.pofile(input) if len(po) != 0: - print >> output, "" + print("", file=output) for entry in po: keyid = entry.msgctxt + '|' + entry.msgid - print >> output, '#. ' + polib.genKeyId(keyid) + print('#. ' + polib.genKeyId(keyid), file=output) for i, occurrence in enumerate(entry.occurrences): entry.occurrences[i] = os.path.relpath(occurrence[0], os.environ['SRCDIR']), occurrence[1] - print >> output, entry + print(entry, file=output) diff --git a/solenv/bin/polib.py b/solenv/bin/polib.py index 5ab421365376..092e7dfdb8b3 100644 --- a/solenv/bin/polib.py +++ b/solenv/bin/polib.py @@ -1858,7 +1858,7 @@ def wrap(text, width=70, **kwargs): # }}} def genKeyId(inkey): - crc = binascii.crc32(bytes(inkey)) & 0xffffffff + crc = binascii.crc32(bytes(inkey, encoding="UTF-8")) & 0xffffffff # Use simple ASCII characters, exclude I, l, 1 and O, 0 to avoid confusing IDs symbols = "ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz23456789"; outkey = "" diff --git a/solenv/bin/uiex b/solenv/bin/uiex index c9b00b2e062c..1f5faead4575 100755 --- a/solenv/bin/uiex +++ b/solenv/bin/uiex @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python3 import polib import binascii @@ -22,13 +22,13 @@ for o, a in myopts: ofile = a with open(ofile, "a") as output: - input = check_output(["xgettext", "--add-comments", "--no-wrap", ifile, "-o", "-"]) + input = check_output(["xgettext", "--add-comments", "--no-wrap", ifile, "-o", "-"], encoding="UTF-8") po = polib.pofile(input) if len(po) != 0: - print >> output, "" + print("", file=output) for entry in po: keyid = entry.msgctxt + '|' + entry.msgid - print >> output, '#. ' + polib.genKeyId(keyid) + print('#. ' + polib.genKeyId(keyid), file=output) for i, occurrence in enumerate(entry.occurrences): entry.occurrences[i] = os.path.relpath(occurrence[0], os.environ['SRCDIR']), occurrence[1] - print >> output, entry + print(entry, file=output) |