Removed ImageCms constants and versions()

Author: radarhere

Tests/test_imagecms.py

@@ -54,10 +54,6 @@ def skip_missing() -> None:
 def test_sanity() -> None:
     # basic smoke test.
     # this mostly follows the cms_test outline.
-    with pytest.warns(DeprecationWarning, match="PIL.ImageCms.versions"):
-        v = ImageCms.versions()  # should return four strings
-    assert v[0] == "1.0.0 pil"
-    assert list(map(type, v)) == [str, str, str, str]
 
     # internal version number
     version = features.version_module("littlecms2")
@@ -703,13 +699,6 @@ def test_cmyk_lab() -> None:
 
 
 def test_deprecation() -> None:
-    with pytest.warns(DeprecationWarning, match="ImageCms.DESCRIPTION"):
-        assert ImageCms.DESCRIPTION.strip().startswith("pyCMS")
-    with pytest.warns(DeprecationWarning, match="ImageCms.VERSION"):
-        assert ImageCms.VERSION == "1.0.0 pil"
-    with pytest.warns(DeprecationWarning, match="ImageCms.FLAGS"):
-        assert isinstance(ImageCms.FLAGS, dict)
-
     profile = ImageCmsProfile(ImageCms.createProfile("sRGB"))
     with pytest.warns(DeprecationWarning, match="RGBA;16B"):
         ImageCms.ImageCmsTransform(profile, profile, "RGBA;16B", "RGB")

docs/deprecations.rst

@@ -12,43 +12,6 @@ Deprecated features
 Below are features which are considered deprecated. Where appropriate,
 a :py:exc:`DeprecationWarning` is issued.
 
-ImageCms constants and versions() function
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. deprecated:: 10.3.0
-
-A number of constants and a function in :py:mod:`.ImageCms` have been deprecated.
-This includes a table of flags based on LittleCMS version 1 which has been
-replaced with a new class :py:class:`.ImageCms.Flags` based on LittleCMS 2 flags.
-
-============================================  ====================================================
-Deprecated                                    Use instead
-============================================  ====================================================
-``ImageCms.DESCRIPTION``                      No replacement
-``ImageCms.VERSION``                          ``PIL.__version__``
-``ImageCms.FLAGS["MATRIXINPUT"]``             :py:attr:`.ImageCms.Flags.CLUT_POST_LINEARIZATION`
-``ImageCms.FLAGS["MATRIXOUTPUT"]``            :py:attr:`.ImageCms.Flags.FORCE_CLUT`
-``ImageCms.FLAGS["MATRIXONLY"]``              No replacement
-``ImageCms.FLAGS["NOWHITEONWHITEFIXUP"]``     :py:attr:`.ImageCms.Flags.NOWHITEONWHITEFIXUP`
-``ImageCms.FLAGS["NOPRELINEARIZATION"]``      :py:attr:`.ImageCms.Flags.CLUT_PRE_LINEARIZATION`
-``ImageCms.FLAGS["GUESSDEVICECLASS"]``        :py:attr:`.ImageCms.Flags.GUESSDEVICECLASS`
-``ImageCms.FLAGS["NOTCACHE"]``                :py:attr:`.ImageCms.Flags.NOCACHE`
-``ImageCms.FLAGS["NOTPRECALC"]``              :py:attr:`.ImageCms.Flags.NOOPTIMIZE`
-``ImageCms.FLAGS["NULLTRANSFORM"]``           :py:attr:`.ImageCms.Flags.NULLTRANSFORM`
-``ImageCms.FLAGS["HIGHRESPRECALC"]``          :py:attr:`.ImageCms.Flags.HIGHRESPRECALC`
-``ImageCms.FLAGS["LOWRESPRECALC"]``           :py:attr:`.ImageCms.Flags.LOWRESPRECALC`
-``ImageCms.FLAGS["GAMUTCHECK"]``              :py:attr:`.ImageCms.Flags.GAMUTCHECK`
-``ImageCms.FLAGS["WHITEBLACKCOMPENSATION"]``  :py:attr:`.ImageCms.Flags.BLACKPOINTCOMPENSATION`
-``ImageCms.FLAGS["BLACKPOINTCOMPENSATION"]``  :py:attr:`.ImageCms.Flags.BLACKPOINTCOMPENSATION`
-``ImageCms.FLAGS["SOFTPROOFING"]``            :py:attr:`.ImageCms.Flags.SOFTPROOFING`
-``ImageCms.FLAGS["PRESERVEBLACK"]``           :py:attr:`.ImageCms.Flags.NONEGATIVES`
-``ImageCms.FLAGS["NODEFAULTRESOURCEDEF"]``    :py:attr:`.ImageCms.Flags.NODEFAULTRESOURCEDEF`
-``ImageCms.FLAGS["GRIDPOINTS"]``              :py:attr:`.ImageCms.Flags.GRIDPOINTS()`
-``ImageCms.versions()``                       :py:func:`PIL.features.version_module` with
-                                              ``feature="littlecms2"``, :py:data:`sys.version` or
-                                              :py:data:`sys.version_info`, and ``PIL.__version__``
-============================================  ====================================================
-
 Non-image modes in ImageCms
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -153,6 +116,78 @@ The functions ``IptcImageFile.dump`` and ``IptcImageFile.i``, and the constant
 intended for internal use, so there is no replacement. They can each be replaced by a
 single line of code using builtin functions in Python.
 
+ImageCms constants and versions() function
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. deprecated:: 10.3.0
+.. versionremoved:: 12.0.0
+
+A number of constants and a function in :py:mod:`.ImageCms` have been removed. This
+includes a table of flags based on LittleCMS version 1 which has been replaced with a
+new class :py:class:`.ImageCms.Flags` based on LittleCMS 2 flags.
+
+============================================  ====================================================
+Deprecated                                    Use instead
+============================================  ====================================================
+``ImageCms.DESCRIPTION``                      No replacement
+``ImageCms.VERSION``                          ``PIL.__version__``
+``ImageCms.FLAGS["MATRIXINPUT"]``             :py:attr:`.ImageCms.Flags.CLUT_POST_LINEARIZATION`
+``ImageCms.FLAGS["MATRIXOUTPUT"]``            :py:attr:`.ImageCms.Flags.FORCE_CLUT`
+``ImageCms.FLAGS["MATRIXONLY"]``              No replacement
+``ImageCms.FLAGS["NOWHITEONWHITEFIXUP"]``     :py:attr:`.ImageCms.Flags.NOWHITEONWHITEFIXUP`
+``ImageCms.FLAGS["NOPRELINEARIZATION"]``      :py:attr:`.ImageCms.Flags.CLUT_PRE_LINEARIZATION`
+``ImageCms.FLAGS["GUESSDEVICECLASS"]``        :py:attr:`.ImageCms.Flags.GUESSDEVICECLASS`
+``ImageCms.FLAGS["NOTCACHE"]``                :py:attr:`.ImageCms.Flags.NOCACHE`
+``ImageCms.FLAGS["NOTPRECALC"]``              :py:attr:`.ImageCms.Flags.NOOPTIMIZE`
+``ImageCms.FLAGS["NULLTRANSFORM"]``           :py:attr:`.ImageCms.Flags.NULLTRANSFORM`
+``ImageCms.FLAGS["HIGHRESPRECALC"]``          :py:attr:`.ImageCms.Flags.HIGHRESPRECALC`
+``ImageCms.FLAGS["LOWRESPRECALC"]``           :py:attr:`.ImageCms.Flags.LOWRESPRECALC`
+``ImageCms.FLAGS["GAMUTCHECK"]``              :py:attr:`.ImageCms.Flags.GAMUTCHECK`
+``ImageCms.FLAGS["WHITEBLACKCOMPENSATION"]``  :py:attr:`.ImageCms.Flags.BLACKPOINTCOMPENSATION`
+``ImageCms.FLAGS["BLACKPOINTCOMPENSATION"]``  :py:attr:`.ImageCms.Flags.BLACKPOINTCOMPENSATION`
+``ImageCms.FLAGS["SOFTPROOFING"]``            :py:attr:`.ImageCms.Flags.SOFTPROOFING`
+``ImageCms.FLAGS["PRESERVEBLACK"]``           :py:attr:`.ImageCms.Flags.NONEGATIVES`
+``ImageCms.FLAGS["NODEFAULTRESOURCEDEF"]``    :py:attr:`.ImageCms.Flags.NODEFAULTRESOURCEDEF`
+``ImageCms.FLAGS["GRIDPOINTS"]``              :py:attr:`.ImageCms.Flags.GRIDPOINTS()`
+``ImageCms.versions()``                       :py:func:`PIL.features.version_module` with
+                                              ``feature="littlecms2"``, :py:data:`sys.version` or
+                                              :py:data:`sys.version_info`, and ``PIL.__version__``
+============================================  ====================================================
+
+ImageMath eval()
+^^^^^^^^^^^^^^^^
+
+.. deprecated:: 10.3.0
+.. versionremoved:: 12.0.0
+
+``ImageMath.eval()`` has been removed. Use :py:meth:`~PIL.ImageMath.lambda_eval` or
+:py:meth:`~PIL.ImageMath.unsafe_eval` instead.
+
+BGR;15, BGR 16 and BGR;24
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. deprecated:: 10.4.0
+.. versionremoved:: 12.0.0
+
+The experimental BGR;15, BGR;16 and BGR;24 modes have been removed.
+
+Support for LibTIFF earlier than 4
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. deprecated:: 10.4.0
+.. versionremoved:: 12.0.0
+
+Support for LibTIFF earlier than version 4 has been removed.
+Upgrade to a newer version of LibTIFF instead.
+
+ImageDraw.getdraw hints parameter
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. deprecated:: 10.4.0
+.. versionremoved:: 12.0.0
+
+The ``hints`` parameter in :py:meth:`~PIL.ImageDraw.getdraw()` has been removed.
+
 Image isImageType()
 ^^^^^^^^^^^^^^^^^^^
 
@@ -201,40 +236,6 @@ removed. They were used for obtaining raw pointers to ``ImagingCore`` internals.
 interact with C code, you can use ``Image.Image.getim()``, which returns a ``Capsule``
 object.
 
-ImageMath eval()
-^^^^^^^^^^^^^^^^
-
-.. deprecated:: 10.3.0
-.. versionremoved:: 12.0.0
-
-``ImageMath.eval()`` has been removed. Use :py:meth:`~PIL.ImageMath.lambda_eval` or
-:py:meth:`~PIL.ImageMath.unsafe_eval` instead.
-
-BGR;15, BGR 16 and BGR;24
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-.. deprecated:: 10.4.0
-.. versionremoved:: 12.0.0
-
-The experimental BGR;15, BGR;16 and BGR;24 modes have been removed.
-
-Support for LibTIFF earlier than 4
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-.. deprecated:: 10.4.0
-.. versionremoved:: 12.0.0
-
-Support for LibTIFF earlier than version 4 has been removed.
-Upgrade to a newer version of LibTIFF instead.
-
-ImageDraw.getdraw hints parameter
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-.. deprecated:: 10.4.0
-.. versionremoved:: 12.0.0
-
-The ``hints`` parameter in :py:meth:`~PIL.ImageDraw.getdraw()` has been removed.
-
 TiffImagePlugin IFD_LEGACY_API
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

docs/reference/ImageCms.rst

@@ -56,7 +56,6 @@ Functions
 .. autofunction:: get_display_profile
 .. autofunction:: isIntentSupported
 .. autofunction:: profileToProfile
-.. autofunction:: versions
 
 CmsProfile
 ----------

src/PIL/ImageCms.py

@@ -108,20 +108,6 @@
 _VERSION = "1.0.0 pil"
 
 
-def __getattr__(name: str) -> Any:
-    if name == "DESCRIPTION":
-        deprecate("PIL.ImageCms.DESCRIPTION", 12)
-        return _DESCRIPTION
-    elif name == "VERSION":
-        deprecate("PIL.ImageCms.VERSION", 12)
-        return _VERSION
-    elif name == "FLAGS":
-        deprecate("PIL.ImageCms.FLAGS", 12, "PIL.ImageCms.Flags")
-        return _FLAGS
-    msg = f"module '{__name__}' has no attribute '{name}'"
-    raise AttributeError(msg)
-
-
 # --------------------------------------------------------------------.
 
 
@@ -1108,16 +1094,3 @@ def isIntentSupported(
             return -1
     except (AttributeError, OSError, TypeError, ValueError) as v:
         raise PyCMSError(v) from v
-
-
-def versions() -> tuple[str, str | None, str, str]:
-    """
-    (pyCMS) Fetches versions.
-    """
-
-    deprecate(
-        "PIL.ImageCms.versions()",
-        12,
-        '(PIL.features.version("littlecms2"), sys.version, PIL.__version__)',
-    )
-    return _VERSION, core.littlecms_version, sys.version.split()[0], __version__