python · vstinner · May 26, 2023 · May 23, 2023 · May 26, 2023 · May 26, 2023
diff --git a/Doc/library/imghdr.rst b/Doc/library/imghdr.rst
diff --git a/Doc/library/superseded.rst b/Doc/library/superseded.rst
@@ -10,5 +10,4 @@ backwards compatibility. They have been superseded by other modules.

 .. toctree::

-   imghdr.rst
   optparse.rst
@@ -6,7 +6,8 @@
 # Sphinx version is pinned so that new versions that introduce new warnings
 # won't suddenly cause build failures. Updating the version is fine as long
 # as no warnings are raised by doing so.
-sphinx==4.5.0
+# PR #104777: Sphinx 6.2 no longer uses imghdr, removed in Python 3.13.
+sphinx==6.2.0

 blurb


@@ -1735,7 +1735,7 @@ Modules
  +---------------------+---------------------+---------------------+---------------------+---------------------+
  | :mod:`!audioop`     | :mod:`!crypt`       | :mod:`!nis`         | :mod:`!sndhdr`      | :mod:`!uu`          |
  +---------------------+---------------------+---------------------+---------------------+---------------------+
-  | :mod:`!cgi`         | :mod:`imghdr`       | :mod:`!nntplib`     | :mod:`!spwd`        | :mod:`!xdrlib`      |
+  | :mod:`!cgi`         | :mod:`!imghdr`      | :mod:`!nntplib`     | :mod:`!spwd`        | :mod:`!xdrlib`      |
  +---------------------+---------------------+---------------------+---------------------+---------------------+
  | :mod:`!cgitb`       | :mod:`!mailcap`     | :mod:`!ossaudiodev` | :mod:`!sunau`       |                     |
  +---------------------+---------------------+---------------------+---------------------+---------------------+

@@ -924,7 +924,7 @@ Modules (see :pep:`594`):
 * :mod:`!cgitb`
 * :mod:`!chunk`
 * :mod:`!crypt`
-* :mod:`imghdr`
+* :mod:`!imghdr`
 * :mod:`!mailcap`
 * :mod:`!msilib`
 * :mod:`!nis`

@@ -244,6 +244,14 @@ Removed
  :class:`typing.TypedDict` types, deprecated in Python 3.11.
  (Contributed by Tomas Roun in :gh:`104786`.)

+* :pep:`594`: Remove the :mod:`!imghdr` module, deprecated in Python 3.11:
+  use the projects
+  `filetype <https://pypi.org/project/filetype/>`_,
+  `puremagic <https://pypi.org/project/puremagic/>`_,
+  or `python-magic <https://pypi.org/project/python-magic/>`_ instead.
+  (Contributed by Victor Stinner in :gh:`104773`.)
+
+
 Porting to Python 3.13
 ======================


@@ -1252,7 +1252,7 @@ Oberkirch in :issue:`21800`.)
 imghdr
 ------

-The :func:`~imghdr.what` function now recognizes the
+The :func:`~!imghdr.what` function now recognizes the
 `OpenEXR <https://www.openexr.com>`_ format
 (contributed by Martin Vignali and Claudiu Popa in :issue:`20295`),
 and the `WebP <https://en.wikipedia.org/wiki/WebP>`_ format

diff --git a/Lib/imghdr.py b/Lib/imghdr.py
diff --git a/Lib/test/imghdrdata/python-raw.jpg b/Lib/test/imghdrdata/python-raw.jpg
diff --git a/Lib/test/imghdrdata/python.bmp b/Lib/test/imghdrdata/python.bmp
diff --git a/Lib/test/imghdrdata/python.exr b/Lib/test/imghdrdata/python.exr
diff --git a/Lib/test/imghdrdata/python.jpg b/Lib/test/imghdrdata/python.jpg
diff --git a/Lib/test/imghdrdata/python.pbm b/Lib/test/imghdrdata/python.pbm
diff --git a/Lib/test/imghdrdata/python.ras b/Lib/test/imghdrdata/python.ras
diff --git a/Lib/test/imghdrdata/python.sgi b/Lib/test/imghdrdata/python.sgi
diff --git a/Lib/test/imghdrdata/python.tiff b/Lib/test/imghdrdata/python.tiff
diff --git a/Lib/test/imghdrdata/python.webp b/Lib/test/imghdrdata/python.webp
-Original file line number
+Diff line change
@@ -244,6 +244,14 @@ Removed
       :class:`typing.TypedDict` types, deprecated in Python 3.11.
       (Contributed by Tomas Roun in :gh:`104786`.)
+    * :pep:`594`: Remove the :mod:`!imghdr` module, deprecated in Python 3.11:
+      use the projects
+      `filetype <https://pypi.org/project/filetype/>`_,
+      `puremagic <https://pypi.org/project/puremagic/>`_,
+      or `python-magic <https://pypi.org/project/python-magic/>`_ instead.
+      (Contributed by Victor Stinner in :gh:`104773`.)
               Copy link

  
        
      
    

    
        

  
  Member


        

    
  

  
    
      
          
      

      
            hugovk
  

      

      

      


        May 23, 2023


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      Reference the PEP.
    
  
  



    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
              
  
    
    
      
        
            
    All reactions
     Porting to Python 3.13
     ======================
-          Expand Down