Skip to content

Commit 4d54e50

Browse files
committed
Merge main into multi_inputs
Rename msgfmt to msgfmt_py accordingly with the changes in main
1 parent 213afcb commit 4d54e50

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Lib/test/test_tools/test_msgfmt.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434

3535
def compile_many_messages(mo_file, *po_files):
36-
assert_python_ok(msgfmt, '-o', mo_file, *po_files)
36+
assert_python_ok(msgfmt_py, '-o', mo_file, *po_files)
3737

3838

3939
def compile_messages(po_file, mo_file):
@@ -291,7 +291,7 @@ def test_both_with_outputfile(self):
291291
Unix endings (lf)
292292
"""
293293
with temp_cwd(None):
294-
assert_python_ok(msgfmt, '-o', 'file12.mo',
294+
assert_python_ok(msgfmt_py, '-o', 'file12.mo',
295295
data_dir / 'file1_fr_crlf.po',
296296
data_dir / 'file2_fr_lf.po')
297297
self.assertTrue(filecmp.cmp(data_dir / 'file12_fr.mo',
@@ -303,7 +303,7 @@ def test_both_without_outputfile(self):
303303
with temp_cwd(None):
304304
shutil.copy(data_dir / 'file1_fr_crlf.po', '.')
305305
shutil.copy(data_dir / 'file2_fr_lf.po', '.')
306-
assert_python_ok(msgfmt, 'file1_fr_crlf.po', 'file2_fr_lf.po')
306+
assert_python_ok(msgfmt_py, 'file1_fr_crlf.po', 'file2_fr_lf.po')
307307
self.assertTrue(filecmp.cmp(data_dir / 'file1_fr_crlf.mo',
308308
'file1_fr_crlf.mo'))
309309
self.assertTrue(filecmp.cmp(data_dir / 'file2_fr_lf.mo',
@@ -314,21 +314,21 @@ class PONamesTest(unittest.TestCase):
314314
def test_no_extension(self):
315315
with temp_cwd(None):
316316
shutil.copy(data_dir / 'file1_fr_crlf.po', 'file1.fr.po')
317-
assert_python_ok(msgfmt, 'file1.fr')
317+
assert_python_ok(msgfmt_py, 'file1.fr')
318318
self.assertTrue(os.path.exists('file1.fr.mo'))
319319

320320
def test_wrong_extension(self):
321321
with temp_cwd(None):
322322
shutil.copy(data_dir / 'file1_fr_crlf.po', 'file1_fr.pox')
323-
assert_python_failure(msgfmt, 'file1_fr.pox')
323+
assert_python_failure(msgfmt_py, 'file1_fr.pox')
324324
self.assertFalse(os.path.exists('file1_fr.mo'))
325325
self.assertFalse(os.path.exists('file1_fr.pox.mo'))
326326

327327
@unittest.skipUnless(sys.platform.startswith("win"), "uppercase on Windows")
328328
def test_MAJ_on_Windows(self):
329329
with temp_cwd(None):
330330
shutil.copy(data_dir / 'file1_fr_crlf.po', 'File1.PO')
331-
assert_python_ok(msgfmt, 'FIle1.Po')
331+
assert_python_ok(msgfmt_py, 'FIle1.Po')
332332
self.assertTrue(os.path.exists('file1.mo'))
333333

334334

0 commit comments

Comments
 (0)