pythongh-104773: PEP 594: Remove the imghdr module

* Remove the Lib/test/imghdrdata/ directory. * Copy 5 pictures (gif, png, ppm, pgm, xbm) from removed Lib/test/imghdrdata/ to a new Lib/test/tkinterdata/ directory.
vstinner · May 23, 2023 · ab17e88 · ab17e88
1 parent 988c1f6
commit ab17e88
Show file tree

Hide file tree

Showing 25 changed files with 17 additions and 423 deletions.
diff --git a/Doc/library/imghdr.rst b/Doc/library/imghdr.rst
diff --git a/Doc/library/sndhdr.rst b/Doc/library/sndhdr.rst
@@ -97,8 +97,8 @@ Example:
 .. code-block:: pycon
 
    >>> import sndhdr
-   >>> imghdr.what('bass.wav')
+   >>> sndhdr.what('bass.wav')
    'wav'
-   >>> imghdr.whathdr('bass.wav')
+   >>> sndhdr.whathdr('bass.wav')
    'wav'
 
diff --git a/Doc/library/superseded.rst b/Doc/library/superseded.rst
@@ -16,7 +16,6 @@ backwards compatibility. They have been superseded by other modules.
    cgitb.rst
    chunk.rst
    crypt.rst
-   imghdr.rst
    mailcap.rst
    msilib.rst
    nis.rst

diff --git a/Doc/whatsnew/3.13.rst b/Doc/whatsnew/3.13.rst
@@ -102,6 +102,11 @@ Deprecated
 Removed
 =======
 
+* Remove the ``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

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