|
5 | 5 | import sys |
6 | 6 | import tempfile |
7 | 7 | import unittest.mock |
8 | | -from os import linesep |
9 | 8 | from platform import win32_edition |
10 | 9 | from test import support |
11 | 10 | from test.support import os_helper |
@@ -422,30 +421,30 @@ def test_invalid_option(self): |
422 | 421 | def test_guess_extension(self): |
423 | 422 | retcode, out, err = self.mimetypes_cmd('-l', '-e', 'image/jpg') |
424 | 423 | self.assertEqual(retcode, 0) |
425 | | - self.assertEqual(out, f'.jpg{linesep}') |
| 424 | + self.assertEqual(out, '.jpg\n') |
426 | 425 | self.assertEqual(err, '') |
427 | 426 |
|
428 | 427 | retcode, out, err = self.mimetypes_cmd('-e', 'image/jpg') |
429 | 428 | self.assertEqual(retcode, 1) |
430 | 429 | self.assertEqual(out, '') |
431 | | - self.assertEqual(err, f'error: unknown type image/jpg{linesep}') |
| 430 | + self.assertEqual(err, 'error: unknown type image/jpg\n') |
432 | 431 |
|
433 | 432 | retcode, out, err = self.mimetypes_cmd('-e', 'image/jpeg') |
434 | 433 | self.assertEqual(retcode, 0) |
435 | | - self.assertEqual(out, f'.jpg{linesep}') |
| 434 | + self.assertEqual(out, '.jpg\n') |
436 | 435 | self.assertEqual(err, '') |
437 | 436 |
|
438 | 437 | def test_guess_type(self): |
439 | 438 | retcode, out, err = self.mimetypes_cmd('-l', 'foo.webp') |
440 | 439 | self.assertEqual(retcode, 0) |
441 | | - self.assertEqual(out, f'type: image/webp encoding: None{linesep}') |
| 440 | + self.assertEqual(out, 'type: image/webp encoding: None\n') |
442 | 441 | self.assertEqual(err, '') |
443 | 442 |
|
444 | 443 | def test_guess_type_conflicting_with_mimetypes(self): |
445 | 444 | retcode, out, err = self.mimetypes_cmd('foo.pic') |
446 | 445 | self.assertEqual(retcode, 1) |
447 | 446 | self.assertEqual(out, '') |
448 | | - self.assertEqual(err, f'error: media type unknown for foo.pic{linesep}') |
| 447 | + self.assertEqual(err, 'error: media type unknown for foo.pic\n') |
449 | 448 |
|
450 | 449 |
|
451 | 450 | if __name__ == "__main__": |
|
0 commit comments