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/msgfmt_data/file12_fr.mo b/Lib/test/test_tools/msgfmt_data/file12_fr.mo
diff --git a/Lib/test/test_tools/msgfmt_data/file1_fr_crlf.mo b/Lib/test/test_tools/msgfmt_data/file1_fr_crlf.mo
diff --git a/Lib/test/test_tools/msgfmt_data/file1_fr_crlf.po b/Lib/test/test_tools/msgfmt_data/file1_fr_crlf.po
 # French translations for python package.
 # Copyright (C) 2018 THE python\'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the python package.
 # s-ball <s-ball@laposte.net>, 2018.
 # Example of French translations, crlf end of lines
 #
 msgid ""
 msgstr ""
 "Project-Id-Version:python 3.8\n"
 "Project-Id-Version:PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-11-30 23:46+0100\n"
 "PO-Revision-Date:2018-11-30 23:47+0100\n"
 "Last-Translator:s-ball <s-ball@laposte.net>\n"
 "PO-Revision-Date:YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator:FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: French\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
diff --git a/Lib/test/test_tools/msgfmt_data/file2_fr_lf.mo b/Lib/test/test_tools/msgfmt_data/file2_fr_lf.mo
diff --git a/Lib/test/test_tools/msgfmt_data/file2_fr_lf.po b/Lib/test/test_tools/msgfmt_data/file2_fr_lf.po
 # French translations for python package.
 # Copyright (C) 2018 THE python'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the python package.
 # s-ball <s-ball@laposte.net>, 2018.
 # Example of French translations, lf end of lines
 #
 msgid ""
 msgstr ""
 "Project-Id-Version:python 3.8\n"
 "Project-Id-Version:PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-11-30 23:57+0100\n"
 "PO-Revision-Date:2018-11-30 23:57+0100\n"
 "Last-Translator:s-ball <s-ball@laposte.net>\n"
 "PO-Revision-Date:YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator:FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: French\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
diff --git a/Lib/test/test_tools/test_msgfmt.py b/Lib/test/test_tools/test_msgfmt.py
 """Tests for the Tools/i18n/msgfmt.py tool."""

 import filecmp
 import os
 import shutil
    for po_file in data_dir.glob('*.po'):
        mo_file = po_file.with_suffix('.mo')
        compile_messages(po_file, mo_file)
    # cannot use compile_message because of both input files
    assert_python_ok(msgfmt, '-o', data_dir /'file12_fr.mo',
                     data_dir / 'file1_fr_crlf.po',
                     data_dir / 'file2_fr_lf.po')
diff --git a/Tools/i18n/msgfmt.py b/Tools/i18n/msgfmt.py
    -o file
    --output-file=file
        Specify the output file to write to.  If omitted, output will go to a
        file named filename.mo (based off the input file name).
        file named filename.mo (based off the input file name(s)).
        If more than one input file is given, and if an output file is passed
        with -o option, then all the input files are merged. If keys are
        repeated (common for "" key for the header) the one from last file is used.
        If more than one input file is given, and no -o option is present, then
        every input file is compiled in its corresponding mo file (same name
        with mo replacing po)

    -h
    --help
    -V
    --version
        Display version information and exit.

 If more than one input file is given, and if an output file is passed with
 -o option, then all the input files are merged. If keys are repeated (common
 for "" key for the header) the one from last file is used.

 If more than one input file is given, and no -o option is present, then
 every input file is compiled in its corresponding mo file (same name with mo
 replacing po)
 """

 import os
        print(msg, file=sys.stderr)


 def main(argv):
 def main():
    try:
        opts, args = getopt.getopt(argv, 'hVo:',
        opts, args = getopt.getopt(sys.argv[1:], 'hVo:',
                                   ['help', 'version', 'output-file='])
    except getopt.error as msg:
        usage(1, msg)


 if __name__ == '__main__':
    main(sys.argv[1:])
    main()
Original file line number	Diff line number	Diff line change
		@@ -1,15 +1,12 @@
		# French translations for python package.
		# Copyright (C) 2018 THE python\'S COPYRIGHT HOLDER
		# This file is distributed under the same license as the python package.
		# s-ball <s-ball@laposte.net>, 2018.
		# Example of French translations, crlf end of lines
		#
		msgid ""
		msgstr ""
		"Project-Id-Version:python 3.8\n"
		"Project-Id-Version:PACKAGE VERSION\n"
		"Report-Msgid-Bugs-To: \n"
		"POT-Creation-Date: 2018-11-30 23:46+0100\n"
		"PO-Revision-Date:2018-11-30 23:47+0100\n"
		"Last-Translator:s-ball <s-ball@laposte.net>\n"
		"PO-Revision-Date:YEAR-MO-DA HO:MI+ZONE\n"
		"Last-Translator:FULL NAME <EMAIL@ADDRESS>\n"
		"Language-Team: French\n"
		"Language: fr\n"
		"MIME-Version: 1.0\n"
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,15 +1,12 @@
		# French translations for python package.
		# Copyright (C) 2018 THE python'S COPYRIGHT HOLDER
		# This file is distributed under the same license as the python package.
		# s-ball <s-ball@laposte.net>, 2018.
		# Example of French translations, lf end of lines
		#
		msgid ""
		msgstr ""
		"Project-Id-Version:python 3.8\n"
		"Project-Id-Version:PACKAGE VERSION\n"
		"Report-Msgid-Bugs-To: \n"
		"POT-Creation-Date: 2018-11-30 23:57+0100\n"
		"PO-Revision-Date:2018-11-30 23:57+0100\n"
		"Last-Translator:s-ball <s-ball@laposte.net>\n"
		"PO-Revision-Date:YEAR-MO-DA HO:MI+ZONE\n"
		"Last-Translator:FULL NAME <EMAIL@ADDRESS>\n"
		"Language-Team: French\n"
		"Language: fr\n"
		"MIME-Version: 1.0\n"
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,5 @@
		"""Tests for the Tools/i18n/msgfmt.py tool."""

		import filecmp
		import os
		import shutil
Expand DownExpand Up		@@ -174,6 +175,7 @@ def update_catalog_snapshots():
		for po_file in data_dir.glob('*.po'):
		mo_file = po_file.with_suffix('.mo')
		compile_messages(po_file, mo_file)
		# cannot use compile_message because of both input files
		assert_python_ok(msgfmt, '-o', data_dir /'file12_fr.mo',
		data_dir / 'file1_fr_crlf.po',
		data_dir / 'file2_fr_lf.po')
Copy link Member merwokMar 3, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. I would use compile_messages, not assert_python_ok Copy link Author s-ballMar 3, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. The problem is that compile_message only supports one single input po file. Do you suggest that I should change the behavior of`compile_message`? Copy link Member merwokMar 4, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Ah… would it be a big change? Copy link Author s-ballMar 4, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Not so big. It should be ready before end of today. Copy link Author s-ballMar 4, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Done. It was enough to swap parameters and allow an arbitrary number for the second through a``... merwok reacted with hooray emoji Copy link Member merwok*Mar 4, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Ah, I assumed that compile_messages came from the tool being tested or the gettext module, but now I see it’s also a test helper – and it calls assert_python_ok! So it didn’t matter after all. But it’s nice (in a very minor way) that the same function is used here.
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,7 +14,13 @@
		-o file
		--output-file=file
		Specify the output file to write to. If omitted, output will go to a
		file named filename.mo (based off the input file name).
		file named filename.mo (based off the input file name(s)).
		If more than one input file is given, and if an output file is passed
		with -o option, then all the input files are merged. If keys are
		repeated (common for "" key for the header) the one from last file is used.
s-ball marked this conversation as resolved. Show resolvedHide resolved
		If more than one input file is given, and no -o option is present, then
		every input file is compiled in its corresponding mo file (same name
s-ball marked this conversation as resolved. Show resolvedHide resolved
		with mo replacing po)

		-h
		--help
Expand All		@@ -23,14 +29,6 @@
		-V
		--version
		Display version information and exit.

		If more than one input file is given, and if an output file is passed with
		-o option, then all the input files are merged. If keys are repeated (common
		for "" key for the header) the one from last file is used.

		If more than one input file is given, and no -o option is present, then
		every input file is compiled in its corresponding mo file (same name with mo
		replacing po)
		"""

		import os
Expand DownExpand Up		@@ -255,9 +253,9 @@ def writefile(outfile, output):
		print(msg, file=sys.stderr)


		def main(argv):
		def main():
		try:
		opts, args = getopt.getopt(argv, 'hVo:',
		opts, args = getopt.getopt(sys.argv[1:], 'hVo:',
		['help', 'version', 'output-file='])
		except getopt.error as msg:
		usage(1, msg)
Expand DownExpand Up		@@ -285,4 +283,4 @@ def main(argv):


		if __name__ == '__main__':
		main(sys.argv[1:])
		main()