Cosmetic improvements after review.

PO test files are changed to the generic like other po files.

Author: s-ball

Lib/test/test_tools/msgfmt_data/file12_fr.mo

@@ -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 <[email protected]>, 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 <[email protected]>\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"

Lib/test/test_tools/msgfmt_data/file1_fr_crlf.mo

@@ -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 <[email protected]>, 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 <[email protected]>\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"

Lib/test/test_tools/msgfmt_data/file1_fr_crlf.po

@@ -1,4 +1,5 @@
 """Tests for the Tools/i18n/msgfmt.py tool."""
+
 import filecmp
 import os
 import shutil
@@ -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')

Lib/test/test_tools/msgfmt_data/file2_fr_lf.mo

@@ -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.
+        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
@@ -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
@@ -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)
@@ -285,4 +283,4 @@ def main(argv):
 
 
 if __name__ == '__main__':
-    main(sys.argv[1:])
+    main()