Revert "Removed backwards-compatible imports for PIL drawers in qrcode.image.styles.moduledrawers."

This reverts commit b132ef9.

Author: bartTC

CHANGES.rst

@@ -8,7 +8,6 @@ WIP
 - **Added** ``GappedCircleModuleDrawer`` (PIL) to render QR code modules as non-contiguous circles. (BenwestGate in `#373`_)
 - **Added** ability to execute as a Python module: ``python -m qrcode --output qrcode.png "hello world"`` (stefansjs in `#400`_)
 - **Removed** the hardcoded 'id' argument from SVG elements. The fixed element ID caused conflicts when embedding multiple QR codes in a single document. (m000 in `#385`_)
-- **Removed** backwards-compatible imports for PIL drawers in ``qrcode.image.styles.moduledrawers``; users are required to import drawers directly from ``qrcode.image.styles.moduledrawers.pil``."
 - Improved test coveraged (akx in `#315`_)
 - Fixed typos in code that used ``embeded`` instead of ``embedded``. For backwards compatibility, the misspelled parameter names are still accepted but now emit deprecation warnings. These deprecated parameter names will be removed in v9.0. (benjnicholls in `#349`_)
 - Migrate pyproject.toml to PEP 621-compliant [project] metadata format. (hroncok in `#399`_)

qrcode/image/styledpil.py

@@ -8,7 +8,7 @@
 
 import qrcode.image.base
 from qrcode.image.styles.colormasks import QRColorMask, SolidFillColorMask
-from qrcode.image.styles.moduledrawers.pil import SquareModuleDrawer
+from qrcode.image.styles.moduledrawers import SquareModuleDrawer
 
 
 class StyledPilImage(qrcode.image.base.BaseImageWithDrawer):

qrcode/image/styles/moduledrawers/__init__.py

@@ -0,0 +1,13 @@
+# For backwards compatibility, importing the PIL drawers here.
+import contextlib
+
+with contextlib.suppress(ImportError):
+    from .pil import (
+        CircleModuleDrawer,  # noqa: F401
+        GappedCircleModuleDrawer,  # noqa: F401
+        GappedSquareModuleDrawer,  # noqa: F401
+        HorizontalBarsDrawer,  # noqa: F401
+        RoundedModuleDrawer,  # noqa: F401
+        SquareModuleDrawer,  # noqa: F401
+        VerticalBarsDrawer,  # noqa: F401
+    )

qrcode/tests/test_qrcode_pil.py

@@ -71,13 +71,13 @@ def test_render_styled_with_embedded_image_path(tmp_path):
 @pytest.mark.parametrize(
     "drawer",
     [
-        moduledrawers.pil.CircleModuleDrawer,
-        moduledrawers.pil.GappedCircleModuleDrawer,
-        moduledrawers.pil.GappedSquareModuleDrawer,
-        moduledrawers.pil.HorizontalBarsDrawer,
-        moduledrawers.pil.RoundedModuleDrawer,
-        moduledrawers.pil.SquareModuleDrawer,
-        moduledrawers.pil.VerticalBarsDrawer,
+        moduledrawers.CircleModuleDrawer,
+        moduledrawers.GappedCircleModuleDrawer,
+        moduledrawers.GappedSquareModuleDrawer,
+        moduledrawers.HorizontalBarsDrawer,
+        moduledrawers.RoundedModuleDrawer,
+        moduledrawers.SquareModuleDrawer,
+        moduledrawers.VerticalBarsDrawer,
     ],
 )
 def test_render_styled_with_drawer(drawer):