Queerscriptors/rttk-queerscriptors
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Update msgfmt for py3 further

Browse source
This commit is contained in:
HackerNCoder 2022-11-07 00:23:32 +01:00
parent c7fef05897
commit ef06aa8744
1 changed files with 44 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
rttk/msgfmt.py
View file

@ -34,6 +34,7 @@ import ast
import getopt import getopt
import struct import struct
import array import array
from email.parser import HeaderParser
__version__ = "1.2" __version__ = "1.2"
@ -41,9 +42,9 @@ MESSAGES = {}
def usage(code, msg=''): def usage(code, msg=''):
print >> sys.stderr, __doc__ print(__doc__, file=sys.stderr)
if msg: if msg:
print >> sys.stderr, msg print(msg, file=sys.stderr)
sys.exit(code) sys.exit(code)
@ -54,23 +55,22 @@ def add(ctxt, id, str, fuzzy):
if ctxt is None: if ctxt is None:
MESSAGES[id] = str MESSAGES[id] = str
else: else:
MESSAGES[ctxt + "\x04" + id] = str MESSAGES[b"%b\x04%b" % (ctxt, id)] = str
def generate(): def generate():
"Return the generated output." "Return the generated output."
global MESSAGES global MESSAGES
keys = MESSAGES.keys()
# the keys are sorted in the .mo file # the keys are sorted in the .mo file
keys.sort() keys = sorted(MESSAGES.keys())
offsets = [] offsets = []
ids = strs = '' ids = strs = b''
for id in keys: for id in keys:
# For each string, we need size and file offset. Each string is NUL # For each string, we need size and file offset. Each string is NUL
# terminated; the NUL does not count into the size. # terminated; the NUL does not count into the size.
offsets.append((len(ids), len(id), len(strs), len(MESSAGES[id]))) offsets.append((len(ids), len(id), len(strs), len(MESSAGES[id])))
ids += id + '\0' ids += id + b'\0'
strs += MESSAGES[id] + '\0' strs += MESSAGES[id] + b'\0'
output = '' output = ''
# The header is 7 32-bit unsigned integers. We don't use hash tables, so # The header is 7 32-bit unsigned integers. We don't use hash tables, so
# the keys start right after the index tables. # the keys start right after the index tables.
@ -93,7 +93,7 @@ def generate():
7*4, # start of key index 7*4, # start of key index
7*4+len(keys)*8, # start of value index 7*4+len(keys)*8, # start of value index
0, 0) # size and offset of hash table 0, 0) # size and offset of hash table
output += array.array("i", offsets).tostring() output += array.array("i", offsets).tobytes()
output += ids output += ids
output += strs output += strs
return output return output
@ -113,17 +113,23 @@ def make(filename, outfile):
outfile = os.path.splitext(infile)[0] + '.mo' outfile = os.path.splitext(infile)[0] + '.mo'
try: try:
lines = open(infile).readlines() with open(infile, 'rb') as f:
lines = f.readlines()
except IOError as msg: except IOError as msg:
print >> sys.stderr, msg print(msg, file=sys.stderr)
sys.exit(1) sys.exit(1)
section = msgctxt = None section = msgctxt = None
fuzzy = 0 fuzzy = 0
# Start off assuming Latin-1, so everything decodes without failure,
# until we know the exact encoding
encoding = 'latin-1'
# Parse the catalog # Parse the catalog
lno = 0 lno = 0
for l in lines: for l in lines:
l = l.decode(encoding)
lno += 1 lno += 1
# If we get a comment line after a msgstr, this is a new entry # If we get a comment line after a msgstr, this is a new entry
if l[0] == '#' and section == STR: if l[0] == '#' and section == STR:
@ -146,34 +152,40 @@ def make(filename, outfile):
elif l.startswith('msgid') and not l.startswith('msgid_plural'): elif l.startswith('msgid') and not l.startswith('msgid_plural'):
if section == STR: if section == STR:
add(msgctxt, msgid, msgstr, fuzzy) add(msgctxt, msgid, msgstr, fuzzy)
if not msgid:
# See whether there is an encoding declaration
p = HeaderParser()
charset = p.parsestr(msgstr.decode(encoding)).get_content_charset()
if charset:
encoding = charset
section = ID section = ID
l = l[5:] l = l[5:]
msgid = msgstr = '' msgid = msgstr = b''
is_plural = False is_plural = False
# This is a message with plural forms # This is a message with plural forms
elif l.startswith('msgid_plural'): elif l.startswith('msgid_plural'):
if section != ID: if section != ID:
print >> sys.stderr, 'msgid_plural not preceded by msgid on %s:%d' %\ print('msgid_plural not preceded by msgid on %s:%d' % (infile, lno),
(infile, lno) file=sys.stderr)
sys.exit(1) sys.exit(1)
l = l[12:] l = l[12:]
msgid += '\0' # separator of singular and plural msgid += b'\0' # separator of singular and plural
is_plural = True is_plural = True
# Now we are in a msgstr section # Now we are in a msgstr section
elif l.startswith('msgstr'): elif l.startswith('msgstr'):
section = STR section = STR
if l.startswith('msgstr['): if l.startswith('msgstr['):
if not is_plural: if not is_plural:
print >> sys.stderr, 'plural without msgid_plural on %s:%d' %\ print('plural without msgid_plural on %s:%d' % (infile, lno),
(infile, lno) file=sys.stderr)
sys.exit(1) sys.exit(1)
l = l.split(']', 1)[1] l = l.split(']', 1)[1]
if msgstr: if msgstr:
msgstr += '\0' # Separator of the various plural forms msgstr += b'\0' # Separator of the various plural forms
else: else:
if is_plural: if is_plural:
print >> sys.stderr, 'indexed msgstr required for plural on %s:%d' %\ print('indexed msgstr required for plural on %s:%d' % (infile, lno),
(infile, lno) file=sys.stderr)
sys.exit(1) sys.exit(1)
l = l[6:] l = l[6:]
# Skip empty lines # Skip empty lines
@ -182,15 +194,15 @@ def make(filename, outfile):
continue continue
l = ast.literal_eval(l) l = ast.literal_eval(l)
if section == CTXT: if section == CTXT:
msgctxt += l msgctxt += l.encode(encoding)
elif section == ID: elif section == ID:
msgid += l msgid += l.encode(encoding)
elif section == STR: elif section == STR:
msgstr += l msgstr += l.encode(encoding)
else: else:
print >> sys.stderr, 'Syntax error on %s:%d' % (infile, lno), \ print('Syntax error on %s:%d' % (infile, lno), \
'before:' 'before:', file=sys.stderr)
print >> sys.stderr, l print(l, file=sys.stderr)
sys.exit(1) sys.exit(1)
# Add last entry # Add last entry
if section == STR: if section == STR:
@ -200,9 +212,10 @@ def make(filename, outfile):
output = generate() output = generate()
try: try:
open(outfile,"wb").write(output) with open(outfile,"wb") as f:
f.write(output)
except IOError as msg: except IOError as msg:
print >> sys.stderr, msg print(msg, file=sys.stderr)
def main(): def main():
@ -218,14 +231,14 @@ def main():
if opt in ('-h', '--help'): if opt in ('-h', '--help'):
usage(0) usage(0)
elif opt in ('-V', '--version'): elif opt in ('-V', '--version'):
print >> sys.stderr, "msgfmt.py", __version__ print("msgfmt.py", __version__)
sys.exit(0) sys.exit(0)
elif opt in ('-o', '--output-file'): elif opt in ('-o', '--output-file'):
outfile = arg outfile = arg
# do it # do it
if not args: if not args:
print >> sys.stderr, 'No input file given' print('No input file given', file=sys.stderr)
print >> sys.stderr, "Try `msgfmt --help' for more information." print("Try `msgfmt --help' for more information.", file=sys.stderr)
return return
for filename in args: for filename in args: