From 655a29b01b8a6536f27a9f4d81e9a511d5332eed Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 5 Aug 2026 21:50:43 +1000 Subject: [PATCH] Remove ExifTags.IFD.Makernote --- docs/deprecations.rst | 18 +++++++++--------- docs/releasenotes/13.0.0.rst | 5 +++++ src/PIL/ExifTags.py | 1 - 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/docs/deprecations.rst b/docs/deprecations.rst index 70745104483..0eec6111221 100644 --- a/docs/deprecations.rst +++ b/docs/deprecations.rst @@ -12,16 +12,8 @@ Deprecated features Below are features which are considered deprecated. Where appropriate, a :py:exc:`DeprecationWarning` is issued. -ExifTags.IFD.Makernote -^^^^^^^^^^^^^^^^^^^^^^ - -.. deprecated:: 11.1.0 - -``ExifTags.IFD.Makernote`` has been deprecated. Instead, use -``ExifTags.IFD.MakerNote``. - Image getdata() -~~~~~~~~~~~~~~~ +^^^^^^^^^^^^^^^ .. deprecated:: 12.1.0 @@ -94,6 +86,14 @@ Image.Image.get_child_images() and so child images could only be retrieved from an :py:class:`PIL.ImageFile.ImageFile` instance. +ExifTags.IFD.Makernote +^^^^^^^^^^^^^^^^^^^^^^ + +.. deprecated:: 11.1.0 +.. versionremoved:: 13.0.0 + +``ExifTags.IFD.Makernote`` has been removed. Instead, use ``ExifTags.IFD.MakerNote``. + ImageFile.raise_oserror ^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/docs/releasenotes/13.0.0.rst b/docs/releasenotes/13.0.0.rst index 45667d9ec07..b2363d9fc7b 100644 --- a/docs/releasenotes/13.0.0.rst +++ b/docs/releasenotes/13.0.0.rst @@ -66,6 +66,11 @@ ImageCms.ImageCmsProfile.product_name and .product_info ``.product_info`` attributes have been removed. They were set to ``None`` since Pillow 2.3.0. +ExifTags.IFD.Makernote +^^^^^^^^^^^^^^^^^^^^^^ + +``ExifTags.IFD.Makernote`` has been removed. Instead, use ``ExifTags.IFD.MakerNote``. + Deprecations ============ diff --git a/src/PIL/ExifTags.py b/src/PIL/ExifTags.py index a9522e761b0..d4bbe270083 100644 --- a/src/PIL/ExifTags.py +++ b/src/PIL/ExifTags.py @@ -355,7 +355,6 @@ class IFD(IntEnum): Exif = 0x8769 GPSInfo = 0x8825 MakerNote = 0x927C - Makernote = 0x927C # Deprecated Interop = 0xA005 IFD1 = -1