- 
          
- 
                Notifications
    You must be signed in to change notification settings 
- Fork 33.3k
          gh-93096: fix test_mimetypes.test_guess_type_conflicting_with_mimetypes
          #131408
        
          New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
          
     Merged
      
      
            hugovk
  merged 11 commits into
  python:main
from
picnixz:fix/test/conflicting-mime-types-93096
  
      
      
   
  Apr 8, 2025 
      
    
      
        
          +64
        
        
          −63
        
        
          
        
      
    
  
  
     Merged
                    Changes from 5 commits
      Commits
    
    
            Show all changes
          
          
            11 commits
          
        
        Select commit
          Hold shift + click to select a range
      
      62863a0
              
                fix `test_mimetypes.test_guess_type_conflicting_with_mimetypes`
              
              
                picnixz 7be23f0
              
                remove checks for linesep
              
              
                picnixz 01e89c3
              
                use `parser.exit()` instead of print + sys.exit()
              
              
                picnixz 60f9eeb
              
                Merge remote-tracking branch 'upstream/main' into fix/test/conflictin…
              
              
                picnixz 1d29b5d
              
                fixup
              
              
                picnixz eeb5635
              
                Update Lib/test/test_mimetypes.py
              
              
                picnixz d9d136e
              
                use Hugo's approach for testing `mimetypes`
              
              
                picnixz 8ba9b1d
              
                Merge branch 'main' into fix/test/conflicting-mime-types-93096
              
              
                picnixz b0c29fa
              
                Update Lib/test/test_mimetypes.py
              
              
                picnixz 56bbd95
              
                [empty commit to trigger CI]
              
              
                picnixz 1efb979
              
                Merge branch 'fix/test/conflicting-mime-types-93096' of github.com:pi…
              
              
                picnixz File filter
Filter by extension
Conversations
          Failed to load comments.   
        
        
          
      Loading
        
  Jump to
        
          Jump to file
        
      
      
          Failed to load files.   
        
        
          
      Loading
        
  Diff view
Diff view
There are no files selected for viewing
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              
      
      Oops, something went wrong.
        
    
  
  Add this suggestion to a batch that can be applied as a single commit.
  This suggestion is invalid because no changes were made to the code.
  Suggestions cannot be applied while the pull request is closed.
  Suggestions cannot be applied while viewing a subset of changes.
  Only one suggestion per line can be applied in a batch.
  Add this suggestion to a batch that can be applied as a single commit.
  Applying suggestions on deleted lines is not supported.
  You must change the existing code in this line in order to create a valid suggestion.
  Outdated suggestions cannot be applied.
  This suggestion has been applied or marked resolved.
  Suggestions cannot be applied from pending reviews.
  Suggestions cannot be applied on multi-line comments.
  Suggestions cannot be applied while the pull request is queued to merge.
  Suggestion cannot be applied right now. Please check back later.
  
    
  
    
Uh oh!
There was an error while loading. Please reload this page.