Dec 2, 2018 · Dec 2, 2018 · Dec 2, 2018 · Dec 4, 2018 · Dec 5, 2018 · Dec 5, 2018
diff --git a/Lib/test/test_tools/test_i18n.py b/Lib/test/test_tools/test_i18n.py
                             'file1_fr.po', 'file2_fr.po')
            with open('file1.mo', 'rb') as fin:
                self.assertEqual(self.file12_fr_mo, fin.read())

    def test_both_without_outputfile(self):
        """Test script without -o option and 2 input files"""
        # msgfmt.py version 1.2 behaviour was that second mo file
        # also merged previous po files
        with temp_cwd(None):
            with open("file1_fr.po", "wb") as out:
                out.write(self.file1_fr_po)
            with open("file2_fr.po", "wb") as out:
                out.write(self.file2_fr_po)
            assert_python_ok(self.script, 'file1_fr.po', 'file2_fr.po')
            with open('file1_fr.mo', 'rb') as fin:
                self.assertEqual(self.file1_fr_mo, fin.read())
            with open('file2_fr.mo', 'rb') as fin:
                self.assertEqual(self.file2_fr_mo, fin.read())

    def test_consecutive_make_calls(self):
        """Directly calls make twice to prove bpo-9741 is fixed"""
        sys.path.append(os.path.join(toolsdir,'i18n'))
        from msgfmt import make
        with temp_cwd(None):
            with open("file1_fr.po", "wb") as out:
                out.write(self.file1_fr_po)
            with open("file2_fr.po", "wb") as out:
                out.write(self.file2_fr_po)
            make("file1_fr.po", "file1_fr.mo")
            make("file2_fr.po", "file2_fr.mo")
            with open('file1_fr.mo', 'rb') as fin:
                self.assertEqual(self.file1_fr_mo, fin.read())
            with open('file2_fr.mo', 'rb') as fin:
                self.assertEqual(self.file2_fr_mo, fin.read())
        sys.path.pop()
diff --git a/Tools/i18n/msgfmt.py b/Tools/i18n/msgfmt.py
 #! /usr/bin/env python3
 # Written by Martin v. Löwis <loewis@informatik.hu-berlin.de>

 # Version 1.3 by s-ball <s-ball@laposte.net>
 """Generate binary message catalog from textual translation description.

 This program converts a textual Uniforum-style message catalog (.po file) into
 import array
 from email.parser import HeaderParser

 __version__ = "1.2"
 __version__ = "1.3"

 MESSAGES = {}

    sys.exit(code)


 def add(ctxt, id, str, fuzzy):
 def add(ctxt, id, str, fuzzy, messages):
    "Add a non-fuzzy translation to the dictionary."
    global MESSAGES
    if not fuzzy and str:
        if ctxt is None:
 MESSAGES[id] = str
 messages[id] = str
        else:
 MESSAGES[b"%b\x04%b" % (ctxt, id)] = str
 messages[b"%b\x04%b" % (ctxt, id)] = str


 def generate():
 def generate(messages):
    "Return the generated output."
    global MESSAGES
    # the keys are sorted in the .mo file
    keys = sorted(MESSAGES.keys())
    keys = sorted(messages.keys())
    offsets = []
    ids = strs = b''
    for id in keys:
        # For each string, we need size and file offset.  Each string is NUL
        # 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 + b'\0'
        strs +=MESSAGES[id] + b'\0'
        strs +=messages[id] + b'\0'
    output = ''
    # The header is 7 32-bit unsigned integers.  We don't use hash tables, so
    # the keys start right after the index tables.
    return output


 def make(filename, outfile):
    ID = 1
    STR = 2
    CTXT = 3
 def make(filenames, outfile):
    messages = {}
    if isinstance(filenames, str):
        infile, outfile = get_names(filenames, outfile)
        process(infile, messages)
    elif outfile is None:
        for filename in filenames:
            infile, outfile = get_names(filename, None)
            messages.clear()
            process(infile, messages)
            output = generate(messages)
            writefile(outfile, output)
        return
    else:
        for filename in filenames:
            infile, _ = get_names(filename, outfile)
            process(infile, messages)
    output = generate(messages)
    writefile(outfile, output)

 def get_names(filename, outfile):
    # Compute .mo name from .po name and arguments
    if filename.endswith('.po'):
        infile = filename
    else:
        infile = filename + '.po'
    if outfile is None:
        outfile = os.path.splitext(infile)[0] + '.mo'
    return infile, outfile

 def process(infile, messages):
    ID = 1
    STR = 2
    CTXT = 3

    try:
        with open(infile, 'rb') as f:
        lno += 1
        # If we get a comment line after a msgstr, this is a new entry
        if l[0] == '#' and section == STR:
            add(msgctxt, msgid, msgstr, fuzzy)
            add(msgctxt, msgid, msgstr, fuzzy, messages)
            section = msgctxt = None
            fuzzy = 0
        # Record a fuzzy mark
        # Now we are in a msgid or msgctxt section, output previous section
        if l.startswith('msgctxt'):
            if section == STR:
                add(msgctxt, msgid, msgstr, fuzzy)
                add(msgctxt, msgid, msgstr, fuzzy, messages)
            section = CTXT
            l = l[7:]
            msgctxt = b''
        elif l.startswith('msgid') and not l.startswith('msgid_plural'):
            if section == STR:
                add(msgctxt, msgid, msgstr, fuzzy)
                add(msgctxt, msgid, msgstr, fuzzy, messages)
                if not msgid:
                    # See whether there is an encoding declaration
                    p = HeaderParser()
            sys.exit(1)
    # Add last entry
    if section == STR:
        add(msgctxt, msgid, msgstr, fuzzy)

    # Compute output
    output = generate()
        add(msgctxt, msgid, msgstr, fuzzy, messages)

 def writefile(outfile, output):
    try:
        with open(outfile,"wb") as f:
            f.write(output)
    except IOError as msg:
        print(msg, file=sys.stderr)


 def main():
 def main(argv):
    try:
        opts, args = getopt.getopt(sys.argv[1:], 'hVo:',
        opts, args = getopt.getopt(argv, 'hVo:',
                                   ['help', 'version', 'output-file='])
    except getopt.error as msg:
        usage(1, msg)
        print('No input file given', file=sys.stderr)
        print("Try `msgfmt --help' for more information.", file=sys.stderr)
        return

    for filename in args:
        make(filename, outfile)
    make(args, outfile)


 if __name__ == '__main__':
    main()
    main(sys.argv[1:])
Original file line number	Diff line number	Diff line change
Expand Up		@@ -424,3 +424,35 @@ def test_both_with_outputfile(self):
		'file1_fr.po', 'file2_fr.po')
		with open('file1.mo', 'rb') as fin:
		self.assertEqual(self.file12_fr_mo, fin.read())

		def test_both_without_outputfile(self):
		"""Test script without -o option and 2 input files"""
		# msgfmt.py version 1.2 behaviour was that second mo file
		# also merged previous po files
		with temp_cwd(None):
		with open("file1_fr.po", "wb") as out:
		out.write(self.file1_fr_po)
		with open("file2_fr.po", "wb") as out:
		out.write(self.file2_fr_po)
		assert_python_ok(self.script, 'file1_fr.po', 'file2_fr.po')
		with open('file1_fr.mo', 'rb') as fin:
		self.assertEqual(self.file1_fr_mo, fin.read())
		with open('file2_fr.mo', 'rb') as fin:
		self.assertEqual(self.file2_fr_mo, fin.read())

		def test_consecutive_make_calls(self):
		"""Directly calls make twice to prove bpo-9741 is fixed"""
		sys.path.append(os.path.join(toolsdir,'i18n'))
		from msgfmt import make
		with temp_cwd(None):
		with open("file1_fr.po", "wb") as out:
		out.write(self.file1_fr_po)
		with open("file2_fr.po", "wb") as out:
		out.write(self.file2_fr_po)
		make("file1_fr.po", "file1_fr.mo")
		make("file2_fr.po", "file2_fr.mo")
		with open('file1_fr.mo', 'rb') as fin:
		self.assertEqual(self.file1_fr_mo, fin.read())
		with open('file2_fr.mo', 'rb') as fin:
		self.assertEqual(self.file2_fr_mo, fin.read())
		sys.path.pop()