Tomas's suggestions

Author: StanFromIreland

Lib/test/test_tools/i18n_data/noheader.pot

@@ -0,0 +1,8 @@
+#: noheader.py:3
+msgid "Foo"
+msgstr ""
+
+#: noheader.py:5
+msgid "Bar"
+msgstr ""
+

Lib/test/test_tools/i18n_data/noheader.py

@@ -0,0 +1,5 @@
+from gettext import gettext as _
+
+_('Foo')
+
+_('Bar')

Lib/test/test_tools/test_i18n.py

@@ -516,22 +516,6 @@ def test_parse_keyword_spec(self):
                     parse_spec(spec)
                 self.assertEqual(str(cm.exception), message)
 
-    def test_omit_header(self):
-        """Test that --omit-header removes the header."""
-        data = self.extract_from_str(dedent('''\
-        _("foo")
-        '''), args=('--omit-header',), raw=True)
-
-        self.assertNotIn("Project-Id-Version", data)
-        self.assertNotIn("POT-Creation-Date", data)
-        self.assertNotIn("PO-Revision-Date", data)
-        self.assertNotIn("Last-Translator", data)
-        self.assertNotIn("Language-Team", data)
-        self.assertNotIn("MIME-Version", data)
-        self.assertNotIn("Content-Type", data)
-        self.assertNotIn("Content-Transfer-Encoding", data)
-        self.assertNotIn("Generated-By", data)
-
 
 def extract_from_snapshots():
     snapshots = {
@@ -542,6 +526,7 @@ def extract_from_snapshots():
         'custom_keywords.py': ('--keyword=foo', '--keyword=nfoo:1,2',
                                '--keyword=pfoo:1c,2',
                                '--keyword=npfoo:1c,2,3'),
+        'noheader.py': ('--omit-header',),
     }
 
     for filename, args in snapshots.items():

Tools/i18n/pygettext.py

@@ -125,13 +125,13 @@
         Set width of output to columns.
 
     --omit-header
-        Don’t write header to file.
+        Do not write header to file.
 
         This is useful for testing purposes because it eliminates a source of
-        variance for generated .gmo files.
+        variance for generated .mo files.
 
-        Note: Using this option will lead to an error if the resulting file
-        would not entirely be in ASCII.
+        Note: Using this option will lead to an error during compilation or other
+        manipulation if the resulting file is not entirely in ASCII.
 
     -x filename
     --exclude-file=filename