From c7fef0589748030b38c44bb0afcb50246f3afcb7 Mon Sep 17 00:00:00 2001 From: HackerNCoder Date: Sat, 5 Nov 2022 18:51:17 +0100 Subject: [PATCH] Update mo2tl, msgfmt for python3 --- mo2tl.py | 8 ++++---- rttk/msgfmt.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mo2tl.py b/mo2tl.py index 923e991..d8102e3 100755 --- a/mo2tl.py +++ b/mo2tl.py @@ -96,7 +96,7 @@ def ugettext_nometadata(translations, lookup): ''' if lookup == '': return None - return translations.ugettext(lookup) + return translations.gettext(lookup) def mo2tl(projectpath, mofile, renpy_target_language): if not re.match('^[a-z_]+$', renpy_target_language, re.IGNORECASE): @@ -136,7 +136,7 @@ def mo2tl(projectpath, mofile, renpy_target_language): # Setup gettext directory structure localedir = tempfile.mkdtemp() - if not os.environ.has_key('LANG'): + if not 'LANG' in os.environ: os.environ['LANG'] = 'en_US.UTF-8' msgdir = os.path.join(localedir, os.environ['LANG'], @@ -152,7 +152,7 @@ def mo2tl(projectpath, mofile, renpy_target_language): translations = gettext.translation('game', localedir) class NoneOnMissingTranslation: @staticmethod - def ugettext(str): + def gettext(str): return None translations.add_fallback(NoneOnMissingTranslation) @@ -215,7 +215,7 @@ def mo2tl(projectpath, mofile, renpy_target_language): out.write(line) else: # dialog block - if not o_blocks_index.has_key(msgid): + if not msgid in o_blocks_index: obsolete = u"# OBSOLETE\n" if last_comment != obsolete: out.write(obsolete) diff --git a/rttk/msgfmt.py b/rttk/msgfmt.py index 78d5cdc..8977f1b 100755 --- a/rttk/msgfmt.py +++ b/rttk/msgfmt.py @@ -87,7 +87,7 @@ def generate(): voffsets += [l2, o2+valuestart] offsets = koffsets + voffsets output = struct.pack("Iiiiiii", - 0x950412deL, # Magic + 0x950412de, # Magic 0, # Version len(keys), # # of entries 7*4, # start of key index @@ -114,7 +114,7 @@ def make(filename, outfile): try: lines = open(infile).readlines() - except IOError, msg: + except IOError as msg: print >> sys.stderr, msg sys.exit(1) @@ -201,7 +201,7 @@ def make(filename, outfile): try: open(outfile,"wb").write(output) - except IOError,msg: + except IOError as msg: print >> sys.stderr, msg @@ -209,7 +209,7 @@ def main(): try: opts, args = getopt.getopt(sys.argv[1:], 'hVo:', ['help', 'version', 'output-file=']) - except getopt.error, msg: + except getopt.error as msg: usage(1, msg) outfile = None