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