use parser.exit() instead of print + sys.exit()

Author: picnixz

Lib/mimetypes.py

@@ -694,16 +694,16 @@ def _main(args=None):
             if guess:
                 print(guess)
             else:
-                print(f"error: unknown type {gtype}", file=sys.stderr)
-                sys.exit(1)
+                # do not use parser.error() as it prints a help message
+                parser.exit(1, f"error: unknown type {gtype}\n")
     else:
         for gtype in args.type:
             guess, encoding = guess_type(gtype, not args.lenient)
             if guess:
                 print('type:', guess, 'encoding:', encoding)
             else:
-                print(f"error: media type unknown for {gtype}", file=sys.stderr)
-                sys.exit(1)
+                # do not use parser.error() as it prints a help message
+                parser.exit(1, f"error: media type unknown for {gtype}\n")
 
 
 if __name__ == '__main__':

Lib/test/test_mimetypes.py

@@ -5,11 +5,11 @@
 import sys
 import tempfile
 import unittest.mock
-
+from os import linesep
+from platform import win32_edition
 from test import support
 from test.support import os_helper
 from test.support.script_helper import run_python_until_end
-from platform import win32_edition
 
 try:
     import _winapi
@@ -422,30 +422,30 @@ def test_invalid_option(self):
     def test_guess_extension(self):
         retcode, out, err = self.mimetypes_cmd('-l', '-e', 'image/jpg')
         self.assertEqual(retcode, 0)
-        self.assertEqual(out, '.jpg\n')
+        self.assertEqual(out, f'.jpg{linesep}')
         self.assertEqual(err, '')
 
         retcode, out, err = self.mimetypes_cmd('-e', 'image/jpg')
         self.assertEqual(retcode, 1)
         self.assertEqual(out, '')
-        self.assertEqual(err, 'error: unknown type image/jpg\n')
+        self.assertEqual(err, f'error: unknown type image/jpg{linesep}')
 
         retcode, out, err = self.mimetypes_cmd('-e', 'image/jpeg')
         self.assertEqual(retcode, 0)
-        self.assertEqual(out, '.jpg\n')
+        self.assertEqual(out, f'.jpg{linesep}')
         self.assertEqual(err, '')
 
     def test_guess_type(self):
         retcode, out, err = self.mimetypes_cmd('-l', 'foo.webp')
         self.assertEqual(retcode, 0)
-        self.assertEqual(out, 'type: image/webp encoding: None\n')
+        self.assertEqual(out, f'type: image/webp encoding: None{linesep}')
         self.assertEqual(err, '')
 
-    def test_z_guess_type_conflicting_with_mimetypes(self):
+    def test_guess_type_conflicting_with_mimetypes(self):
         retcode, out, err = self.mimetypes_cmd('foo.pic')
         self.assertEqual(retcode, 1)
         self.assertEqual(out, '')
-        self.assertEqual(err, 'error: media type unknown for foo.pic\n')
+        self.assertEqual(err, f'error: media type unknown for foo.pic{linesep}')
 
 
 if __name__ == "__main__":