Merge branch 'main' into feature/svg-rounded-module-drawer

Author: bartTC

qrcode/LUT.py

@@ -1,10 +1,10 @@
-"""
-Store all kinds of lookup table.
-"""
+# Store all kinds of lookup table.
+
+
 # # generate rsPoly lookup table.
 
 # from qrcode import base
-#
+
 # def create_bytes(rs_blocks):
 #     for r in range(len(rs_blocks)):
 #         dcCount = rs_blocks[r].data_count
@@ -13,7 +13,7 @@
 #         for i in range(ecCount):
 #             rsPoly = rsPoly * base.Polynomial([1, base.gexp(i)], 0)
 #         return ecCount, rsPoly
-#
+
 # rsPoly_LUT = {}
 # for version in range(1,41):
 #     for error_correction in range(4):

qrcode/__init__.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from qrcode.main import QRCode
 from qrcode.main import make  # noqa
 from qrcode.constants import (  # noqa

qrcode/base.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import NamedTuple
 from qrcode import constants
 

qrcode/console_scripts.py

@@ -6,12 +6,10 @@
 a pipe to a file an image is written. The default image format is PNG.
 """
 
-from __future__ import annotations
-
 import optparse
 import os
 import sys
-from typing import NoReturn
+from typing import NoReturn, Optional
 from collections.abc import Iterable
 from importlib import metadata
 
@@ -124,7 +122,7 @@ def raise_error(msg: str) -> NoReturn:
             return
 
         kwargs = {}
-        aliases: DrawerAliases | None = getattr(
+        aliases: Optional[DrawerAliases] = getattr(
             qr.image_factory, "drawer_aliases", None
         )
         if opts.factory_drawer:
@@ -158,7 +156,7 @@ def get_drawer_help() -> str:
             image = get_factory(module)
         except ImportError:  # pragma: no cover
             continue
-        aliases: DrawerAliases | None = getattr(image, "drawer_aliases", None)
+        aliases: Optional[DrawerAliases] = getattr(image, "drawer_aliases", None)
         if not aliases:
             continue
         factories = help.setdefault(commas(aliases), set())

qrcode/constants.py

@@ -1,7 +1,5 @@
-from __future__ import annotations
-
 # QR error correct levels
-ERROR_CORRECT_L: int = 1
-ERROR_CORRECT_M: int = 0
-ERROR_CORRECT_Q: int = 3
-ERROR_CORRECT_H: int = 2
+ERROR_CORRECT_L = 1
+ERROR_CORRECT_M = 0
+ERROR_CORRECT_Q = 3
+ERROR_CORRECT_H = 2

qrcode/exceptions.py

@@ -1,5 +1,2 @@
-from __future__ import annotations
-
-
 class DataOverflowError(Exception):
     pass

qrcode/image/base.py

@@ -1,7 +1,5 @@
-from __future__ import annotations
-
 import abc
-from typing import TYPE_CHECKING, Any, Union
+from typing import TYPE_CHECKING, Any, Optional, Union
 
 from qrcode.image.styles.moduledrawers.base import QRModuleDrawer
 
@@ -17,8 +15,8 @@ class BaseImage(abc.ABC):
     Base QRCode image output class.
     """
 
-    kind: str | None = None
-    allowed_kinds: tuple[str, ...] | None = None
+    kind: Optional[str] = None
+    allowed_kinds: Optional[tuple[str]] = None
     needs_context = False
     needs_processing = False
     needs_drawrect = True
@@ -142,7 +140,7 @@ def __init__(
 
     def get_drawer(
         self, drawer: Union[QRModuleDrawer, str, None]
-    ) -> QRModuleDrawer | None:
+    ) -> Optional[QRModuleDrawer]:
         if not isinstance(drawer, str):
             return drawer
         drawer_cls, kwargs = self.drawer_aliases[drawer]

qrcode/image/pil.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import qrcode.image.base
 from PIL import Image, ImageDraw
 

qrcode/image/pure.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from itertools import chain
 
 from qrcode.compat.png import PngWriter

qrcode/image/styles/colormasks.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import math
 
 from PIL import Image