Generate json files for MultiInputTest data files.

Author: s-ball

Lib/test/test_tools/msgfmt_data/file12_fr.json

@@ -0,0 +1,32 @@
+[
+    [
+        "",
+        "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2018-11-30 23:57+0100\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: French\nLanguage: fr\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=(n > 1);\n"
+    ],
+    [
+        "Bye...",
+        "Au revoir ..."
+    ],
+    [
+        "Hello!",
+        "Bonjour !"
+    ],
+    [
+        "It's over.",
+        "C'est termin\u00e9."
+    ],
+    [
+        [
+            "{n} horse",
+            0
+        ],
+        "{n} cheval"
+    ],
+    [
+        [
+            "{n} horse",
+            1
+        ],
+        "{n} chevaux"
+    ]
+]

Lib/test/test_tools/msgfmt_data/file1_fr_crlf.json

@@ -0,0 +1,24 @@
+[
+    [
+        "",
+        "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2018-11-30 23:46+0100\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: French\nLanguage: fr\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=(n > 1);\n"
+    ],
+    [
+        "Hello!",
+        "Bonjour !"
+    ],
+    [
+        [
+            "{n} horse",
+            0
+        ],
+        "{n} cheval"
+    ],
+    [
+        [
+            "{n} horse",
+            1
+        ],
+        "{n} chevaux"
+    ]
+]

Lib/test/test_tools/msgfmt_data/file2_fr_lf.json

@@ -0,0 +1,14 @@
+[
+    [
+        "",
+        "Project-Id-Version: PACKAGE VERSION\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2018-11-30 23:57+0100\nPO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\nLast-Translator: FULL NAME <EMAIL@ADDRESS>\nLanguage-Team: French\nLanguage: fr\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\nPlural-Forms: nplurals=2; plural=(n > 1);\n"
+    ],
+    [
+        "Bye...",
+        "Au revoir ..."
+    ],
+    [
+        "It's over.",
+        "C'est termin\u00e9."
+    ]
+]

Lib/test/test_tools/test_msgfmt.py

@@ -10,7 +10,6 @@
 
 import filecmp
 import json
-import os
 import shutil
 import sys
 import unittest
@@ -21,7 +20,6 @@
 from test.support.script_helper import assert_python_failure, assert_python_ok
 from test.test_tools import skip_if_missing, toolsdir
 
-
 skip_if_missing('i18n')
 
 data_dir = (Path(__file__).parent / 'msgfmt_data').resolve()
@@ -62,16 +60,10 @@ def test_translations(self):
         self.assertEqual(t.gettext('Multilinestring'), 'Multilinetranslation')
         self.assertEqual(t.gettext('"escapes"'), '"translated"')
         self.assertEqual(t.gettext('\n newlines \n'), '\n translated \n')
-        self.assertEqual(t.ngettext('One email sent.', '%d emails sent.', 1),
-                         'One email sent.')
-        self.assertEqual(t.ngettext('One email sent.', '%d emails sent.', 2),
-                         '%d emails sent.')
-        self.assertEqual(t.npgettext('abc', 'One email sent.',
-                                     '%d emails sent.', 1),
-                         'One email sent.')
-        self.assertEqual(t.npgettext('abc', 'One email sent.',
-                                     '%d emails sent.', 2),
-                         '%d emails sent.')
+        self.assertEqual(t.ngettext('One email sent.', '%d emails sent.', 1), 'One email sent.')
+        self.assertEqual(t.ngettext('One email sent.', '%d emails sent.', 2), '%d emails sent.')
+        self.assertEqual(t.npgettext('abc', 'One email sent.', '%d emails sent.', 1), 'One email sent.')
+        self.assertEqual(t.npgettext('abc', 'One email sent.', '%d emails sent.', 2), '%d emails sent.')
 
     def test_po_with_bom(self):
         with temp_cwd():
@@ -165,9 +157,7 @@ def test_no_outputfile(self):
         with temp_cwd(None):
             shutil.copy(data_dir / 'file2_fr_lf.po', '.')
             assert_python_ok(msgfmt, 'file2_fr_lf.po')
-            self.assertTrue(
-                filecmp.cmp(data_dir / 'file2_fr_lf.mo', 'file2_fr_lf.mo'),
-                'Wrong compiled file2_fr_lf.mo')
+            self.assertTrue(filecmp.cmp(data_dir / 'file2_fr_lf.mo', 'file2_fr_lf.mo'), 'Wrong compiled file2_fr_lf.mo')
 
     def test_both_with_outputfile(self):
         """Test script with -o option and 2 input files
@@ -179,11 +169,8 @@ def test_both_with_outputfile(self):
         Unix endings (lf)
         """
         with temp_cwd(None):
-            assert_python_ok(msgfmt, '-o', 'file12.mo',
-                             data_dir / 'file1_fr_crlf.po',
-                             data_dir / 'file2_fr_lf.po')
-            self.assertTrue(
-                filecmp.cmp(data_dir / 'file12_fr.mo', 'file12.mo'))
+            assert_python_ok(msgfmt, '-o', 'file12.mo', data_dir / 'file1_fr_crlf.po', data_dir / 'file2_fr_lf.po')
+            self.assertTrue(filecmp.cmp(data_dir / 'file12_fr.mo', 'file12.mo'))
 
     def test_both_without_outputfile(self):
         """Test script without -o option and 2 input files"""
@@ -192,30 +179,30 @@ def test_both_without_outputfile(self):
             shutil.copy(data_dir / 'file1_fr_crlf.po', '.')
             shutil.copy(data_dir / 'file2_fr_lf.po', '.')
             assert_python_ok(msgfmt, 'file1_fr_crlf.po', 'file2_fr_lf.po')
-            self.assertTrue(
-                filecmp.cmp(data_dir / 'file1_fr_crlf.mo', 'file1_fr_crlf.mo'))
-            self.assertTrue(
-                filecmp.cmp(data_dir / 'file2_fr_lf.mo', 'file2_fr_lf.mo'))
+            self.assertTrue(filecmp.cmp(data_dir / 'file1_fr_crlf.mo', 'file1_fr_crlf.mo'))
+            self.assertTrue(filecmp.cmp(data_dir / 'file2_fr_lf.mo', 'file2_fr_lf.mo'))
+
+
+def make_message_files(mo_file, *po_files):
+    compile_messages(mo_file, *po_files)
+    # Create a human-readable JSON file which is
+    # easier to review than the binary .mo file.
+    with open(mo_file, 'rb') as f:
+        translations = GNUTranslations(f)
+    catalog_file = mo_file.with_suffix('.json')
+    with open(catalog_file, 'w') as f:
+        data = translations._catalog.items()
+        data = sorted(data, key=lambda x: (isinstance(x[0], tuple), x[0]))
+        json.dump(data, f, indent=4)
+        f.write('\n')
 
 
 def update_catalog_snapshots():
     for po_file in data_dir.glob('*.po'):
         mo_file = po_file.with_suffix('.mo')
-        compile_messages(mo_file, po_file)
-        # Create a human-readable JSON file which is
-        # easier to review than the binary .mo file.
-        with open(mo_file, 'rb') as f:
-            translations = GNUTranslations(f)
-        catalog_file = po_file.with_suffix('.json')
-        with open(catalog_file, 'w') as f:
-            data = translations._catalog.items()
-            data = sorted(data, key=lambda x: (isinstance(x[0], tuple), x[0]))
-            json.dump(data, f, indent=4)
-            f.write('\n')
+        make_message_files(mo_file, po_file)
     # special processing for file12_fr.mo which results from 2 input files
-    compile_messages(data_dir / 'file12_fr.mo',
-                     data_dir / 'file1_fr_crlf.po',
-                     data_dir / 'file2_fr_lf.po')
+    make_message_files(data_dir / 'file12_fr.mo', data_dir / 'file1_fr_crlf.po', data_dir / 'file2_fr_lf.po')
 
 
 if __name__ == '__main__':