gh-104773: PEP 594: Remove the imghdr module by vstinner · Pull Request #104777 · python/cpython · GitHub

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.

Issue: PEP 594: Remove stdlib modules scheduled for deletion in Python 3.13 #104773

📚 Documentation preview 📚: https://cpython-previews--104777.org.readthedocs.build/

The Docs CI job fails with:

Could not import extension sphinx.builders.epub3 (exception: No module named 'imghdr')

Oh. It seems like the Sphinx EPUB builder requires the removed imghdr module.

cc @JulienPalard @deronnax

Sphinx used to depend on imghdr, but no longer does as of Sphinx 6.2.0:

Therefore we'll need to start using Sphinx 6.2.0 for Python 3.13.

cc @AA-Turner @CAM-Gerlach.

Therefore we'll need to start using Sphinx 6.2.0 for Python 3.13.

@doko42 would it be managable from a Debian packaging point of view?

Do we have some contacts with other distribs?

I remember the last bump of needs_sphinx raised a lot of concerns.

@encukou Is requiring Sphinx 6.2.0 for Python 3.13 okay for Red Hat?

Avoid new Sphinx warnings:

diff --git a/Doc/whatsnew/3.11.rst b/Doc/whatsnew/3.11.rst
index 7a479c6e56..9b33155c5a 100644
--- 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.5.rst b/Doc/whatsnew/3.5.rst
index 14b6425cea..d13036f6fd 100644
--- 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

Suggested change

      
            * ``imghdr``
          
            * :mod:`!imghdr`

Reference the PEP.

Is requiring Sphinx 6.2.0 for Python 3.13 okay for Red Hat?

Yes. It's OK for Fedora. (And RHEL will follow Fedora after some time.)

Avoid new Sphinx warnings:

diff --git a/Doc/whatsnew/3.5.rst b/Doc/whatsnew/3.5.rst
index 14b6425cea..d13036f6fd 100644
--- 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
...

We should likely prefer :func:`~!imghdr.what` to keep the rendered HTML showing only what.

A

Suggested change

      
            * Remove the ``imghdr`` module, deprecated in Python 3.11: use the projects
          
            * Remove the :mod:`!imghdr` module, deprecated in Python 3.11: use the projects

Suggested change

      
            Remove the ``imghdr`` module, deprecated in Python 3.11: use the projects
          
            Remove the :mod:`!imghdr` module, deprecated in Python 3.11: use the projects

OpenSUSE is using Sphinx 7 for Python 3.12 builds

Debian and Ubuntu are the only remaining distributions from the list we checked last time.

A

I created issue #104818 "Require Sphinx 6.2 to build Python 3.13 documentation". I propose to discuss updating Sphinx (or not) there.

I rebased the PR on the main branch.

* 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.

Looks good, we can use Sphinx 6.2 for the "normal" docs build and for doctest (both use requirements.txt), and still support 3.2 in Doc/requirements-oldest-sphinx.txt.

Looks good, we can use Sphinx 6.2 for the "normal" docs build and for doctest (both use requirements.txt), and still support 3.2 in Doc/requirements-oldest-sphinx.txt.

Right. I only upgraded Sphinx in the GHA "Doctest" job. It seems like increasing the minimum Sphinx version to build the documentation is not strictly required to remove the imghdr module.

I prefer to decorelate the imghdr removal and increase the minimum Sphinx version to build the Python documentation. So far, still supporting Sphinx 3.2 makes it possible to build Python 3.13 documentation on Debian Stable: #104818 (comment)

bedevere-bot added the awaiting core review label May 23, 2023

bedevere-bot mentioned this pull request May 23, 2023

PEP 594: Remove stdlib modules scheduled for deletion in Python 3.13 #104773

Closed

19 tasks

hugovk self-requested a review May 23, 2023 09:44

hugovk reviewed May 23, 2023

View reviewed changes

AA-Turner reviewed May 23, 2023

View reviewed changes

vstinner mentioned this pull request May 23, 2023

Require Sphinx 6.2 to build Python 3.13 documentation #104818

Closed

vstinner marked this pull request as draft May 24, 2023 12:56

bedevere-bot removed the awaiting core review label May 24, 2023

vstinner changed the title gh-104773: PEP 594: Remove the imghdr module WIP (blocked by Sphinx): gh-104773: PEP 594: Remove the imghdr module May 24, 2023

vstinner force-pushed the remove_imghdr branch from e39d2ed to d2d6d86 Compare May 25, 2023 16:33

vstinner force-pushed the remove_imghdr branch from d2d6d86 to b5dd54d Compare May 26, 2023 12:55

vstinner changed the title WIP (blocked by Sphinx): gh-104773: PEP 594: Remove the imghdr module gh-104773: PEP 594: Remove the imghdr module May 26, 2023

vstinner marked this pull request as ready for review May 26, 2023 12:56

bedevere-bot added the awaiting core review label May 26, 2023

vstinner added 3 commits May 26, 2023 15:00

pythongh-104773 : PEP 594: Remove the imghdr module

06b091c

* 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.

Upgrade Sphinx

e503fbb

* Update Sphinx from 4.5 to 6.2 in Doc/requirements.txt.

Add a comment explaining Sphinx 6.2 version

7b2c914

vstinner force-pushed the remove_imghdr branch from 21ae588 to 7b2c914 Compare May 26, 2023 13:00

vstinner enabled auto-merge (squash) May 26, 2023 13:14

hugovk approved these changes May 26, 2023

View reviewed changes

bedevere-bot added awaiting merge and removed awaiting core review labels May 26, 2023

vstinner merged commit e399f46 into python:main May 26, 2023

bedevere-bot removed the awaiting merge label May 26, 2023

vstinner deleted the remove_imghdr branch May 26, 2023 14:52

               * :mod:`chunk`
               * :mod:`crypt`
-              * :mod:`imghdr`
+              * ``imghdr``

+                `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`.)

+              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. Patch by Victor Stinner.

	* Remove the ``imghdr`` module, deprecated in Python 3.11: use the projects
	* Remove the :mod:`!imghdr` module, deprecated in Python 3.11: use the projects

		@@ -0,0 +1,4 @@
		Remove the ``imghdr`` module, deprecated in Python 3.11: use the projects

	Remove the ``imghdr`` module, deprecated in Python 3.11: use the projects
	Remove the :mod:`!imghdr` module, deprecated in Python 3.11: use the projects

gh-104773: PEP 594: Remove the imghdr module by vstinner · Pull Request #104777 · python/cpython · GitHub

Uh oh!

Uh oh!

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

gh-104773: PEP 594: Remove the imghdr module#104777vstinner merged 3 commits intopython:mainpython/cpython:mainfrom vstinner:remove_imghdrvstinner/cpython:remove_imghdrCopy head branch name to clipboard

Conversation

vstinner commented May 23, 2023 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vstinner commented May 23, 2023

Uh oh!

hugovk commented May 23, 2023

Uh oh!

JulienPalard commented May 23, 2023

Uh oh!

hugovk commented May 23, 2023

Uh oh!

hugovk left a comment

Choose a reason for hiding this comment

Uh oh!

hugovk May 23, 2023

Choose a reason for hiding this comment

Uh oh!

hugovk May 23, 2023

Choose a reason for hiding this comment

Uh oh!

hugovk May 23, 2023

Choose a reason for hiding this comment

Uh oh!

encukou commented May 23, 2023

Uh oh!

AA-Turner commented May 23, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

AA-Turner May 23, 2023

Choose a reason for hiding this comment

Uh oh!

AA-Turner May 23, 2023

Choose a reason for hiding this comment

Uh oh!

AA-Turner commented May 23, 2023

Uh oh!

vstinner commented May 23, 2023

Uh oh!

vstinner commented May 25, 2023

Uh oh!

hugovk left a comment

Choose a reason for hiding this comment

Uh oh!

vstinner commented May 26, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

gh-104773: PEP 594: Remove the imghdr module#104777
vstinner merged 3 commits into
python:mainfrom
vstinner:remove_imghdr

vstinner commented May 23, 2023 •
edited by github-actions Bot
Loading

AA-Turner commented May 23, 2023 •
edited
Loading