gh-104773: PEP 594: Remove the imghdr module (#104777)

* 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. * Update Sphinx from 4.5 to 6.2 in Doc/requirements.txt.
python · May 26, 2023 · e399f46 · e399f46
1 parent ba73473
commit e399f46
Show file tree

Hide file tree

Showing 28 changed files with 21 additions and 425 deletions.
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
diff --git a/Doc/requirements.txt b/Doc/requirements.txt
@@ -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
 

diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
@@ -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`       |                     |
   +---------------------+---------------------+---------------------+---------------------+---------------------+

diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
@@ -924,7 +924,7 @@ Modules (see :pep:`594`):
 * :mod:`!cgitb`
 * :mod:`!chunk`
 * :mod:`!crypt`
-* :mod:`imghdr`
+* :mod:`!imghdr`
 * :mod:`!mailcap`
 * :mod:`!msilib`
 * :mod:`!nis`

diff --git a/Doc/whatsnew/3.13.rst b/Doc/whatsnew/3.13.rst
@@ -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
 ======================
 

diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst
@@ -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 number	Diff line change
Expand Up		@@ -10,5 +10,4 @@ backwards compatibility. They have been superseded by other modules.

		.. toctree::

		imghdr.rst
		optparse.rst