gh-93096: fix `test_mimetypes.test_guess_type_conflicting_with_mimetypes`#131408

Merged

hugovk merged 11 commits intopython:mainfrom

picnixz:fix/test/conflicting-mime-types-93096

Apr 8, 2025

Commits on Mar 18, 2025

fix `test_mimetypes.test_guess_type_conflicting_with_mimetypes`
Show description for 62863a0
picnixz
committed
62863a0
Copy full SHA for 62863a0
remove checks for linesep
picnixz
committed
7be23f0
Copy full SHA for 7be23f0

Commits on Mar 26, 2025

use `parser.exit()` instead of print + sys.exit()
picnixz
committed
01e89c3
Copy full SHA for 01e89c3

Commits on Mar 28, 2025

Merge remote-tracking branch 'upstream/main' into fix/test/conflicting-mime-types-93096
picnixz
committed
60f9eeb
Copy full SHA for 60f9eeb
fixup
picnixz
committed
1d29b5d
Copy full SHA for 1d29b5d

Commits on Mar 30, 2025

Update Lib/test/test_mimetypes.py
picnixz
authored
eeb5635
Copy full SHA for eeb5635

Commits on Apr 8, 2025

use Hugo's approach for testing `mimetypes`
picnixz
committed
d9d136e
Copy full SHA for d9d136e
Merge branch 'main' into fix/test/conflicting-mime-types-93096
picnixz
authored
8ba9b1d
Copy full SHA for 8ba9b1d
Update Lib/test/test_mimetypes.py
picnixz
authored
b0c29fa
Copy full SHA for b0c29fa
[empty commit to trigger CI]
picnixz
committed
56bbd95
Copy full SHA for 56bbd95
Merge branch 'fix/test/conflicting-mime-types-93096' of github.com:picnixz/cpython into fix/test/conflicting-mime-types-93096
picnixz
committed
1efb979
Copy full SHA for 1efb979