Revert EM101 102

Author: bartTC

pyproject.toml

@@ -111,6 +111,8 @@ lint.ignore = [
   "ARG005", # Unused lambda argument
   "D", # Missing or badly formatted docstrings
   "E501", # Line too long (>88)
+  "EM101", # Exception must not use a string literal, assign to variable first
+  "EM102", # Exception must not use an f-string literal, assign to variable first   "ERA001", # Found commented-out code
   "ERA001", # Found commented-out code
   "FBT", # Flake Boolean Trap (don't use arg=True in functions)
   "N999", # Invalid module name
@@ -119,6 +121,7 @@ lint.ignore = [
   "RUF012", # Mutable class attributes https://github.com/astral-sh/ruff/issues/5243
   "SIM105", # Use contextlib.suppress(ImportError) instead of try-except-pass
   "SLF001", # private-member-access
+  "TRY003", # Avoid specifying long messages outside the exception class
 
   # Should be fixed later
   "C901", # Too complex

qrcode/base.py

@@ -234,8 +234,7 @@
 
 def glog(n):
     if n < 1:  # pragma: no cover
-        msg = f"glog({n})"
-        raise ValueError(msg)
+        raise ValueError(f"glog({n})")
     return LOG_TABLE[n]
 
 
@@ -246,8 +245,7 @@ def gexp(n):
 class Polynomial:
     def __init__(self, num, shift):
         if not num:  # pragma: no cover
-            msg = f"{len(num)}/{shift}"
-            raise ValueError(msg)
+            raise ValueError(f"{len(num)}/{shift}")
 
         offset = 0
         for offset in range(len(num)):
@@ -299,10 +297,9 @@ class RSBlock(NamedTuple):
 
 def rs_blocks(version, error_correction):
     if error_correction not in RS_BLOCK_OFFSET:  # pragma: no cover
-        msg = (
+        raise ValueError(
             f"bad rs block @ version: {version} / error_correction: {error_correction}"
         )
-        raise ValueError(msg)
     offset = RS_BLOCK_OFFSET[error_correction]
     rs_block = RS_BLOCK_TABLE[(version - 1) * 4 + offset]
 

qrcode/console_scripts.py

@@ -149,8 +149,7 @@ def raise_error(msg: str) -> NoReturn:
 
 def get_factory(module: str) -> type[BaseImage]:
     if "." not in module:
-        msg = "The image factory is not a full python path"
-        raise ValueError(msg)
+        raise ValueError("The image factory is not a full python path")
     module, name = module.rsplit(".", 1)
     imp = __import__(module, {}, {}, [name])
     return getattr(imp, name)

qrcode/image/base.py

@@ -42,15 +42,13 @@ def drawrect_context(self, row: int, col: int, qr: QRCode):
         """
         Draw a single rectangle of the QR code given the surrounding context
         """
-        msg = "BaseImage.drawrect_context"
-        raise NotImplementedError(msg)  # pragma: no cover
+        raise NotImplementedError("BaseImage.drawrect_context")  # pragma: no cover
 
     def process(self):
         """
         Processes QR code after completion
         """
-        msg = "BaseImage.drawimage"
-        raise NotImplementedError(msg)  # pragma: no cover
+        raise NotImplementedError("BaseImage.drawimage")  # pragma: no cover
 
     @abc.abstractmethod
     def save(self, stream, kind=None):
@@ -97,8 +95,7 @@ def check_kind(self, kind, transform=None):
             if not allowed:
                 allowed = kind in self.allowed_kinds
         if not allowed:
-            msg = f"Cannot set {type(self).__name__} type to {kind}"
-            raise ValueError(msg)
+            raise ValueError(f"Cannot set {type(self).__name__} type to {kind}")
         return kind
 
     def is_eye(self, row: int, col: int):

qrcode/image/pil.py

@@ -14,8 +14,7 @@ class PilImage(qrcode.image.base.BaseImage):
 
     def new_image(self, **kwargs):
         if not Image:
-            msg = "PIL library not found."
-            raise ImportError(msg)
+            raise ImportError("PIL library not found.")
 
         back_color = kwargs.get("back_color", "white")
         fill_color = kwargs.get("fill_color", "black")

qrcode/image/pure.py

@@ -16,8 +16,7 @@ class PyPNGImage(BaseImage):
 
     def new_image(self, **kwargs):
         if not PngWriter:
-            msg = "PyPNG library not installed."
-            raise ImportError(msg)
+            raise ImportError("PyPNG library not installed.")
 
         return PngWriter(self.pixel_size, self.pixel_size, greyscale=True, bitdepth=1)
 

qrcode/image/styles/colormasks.py

@@ -56,8 +56,7 @@ def apply_mask(self, image, use_cache=False):
                     pixels[x, y] = self.get_bg_pixel(image, x, y)
 
     def get_fg_pixel(self, image, x, y):
-        msg = "QRModuleDrawer.paint_fg_pixel"
-        raise NotImplementedError(msg)
+        raise NotImplementedError("QRModuleDrawer.paint_fg_pixel")
 
     def get_bg_pixel(self, image, x, y):
         return self.back_color

qrcode/image/styles/moduledrawers/__init__.py

@@ -43,5 +43,4 @@ def __getattr__(name):
         return getattr(pil, name)
 
     # For any other attribute, raise AttributeError
-    msg = f"module {__name__!r} has no attribute {name!r}"
-    raise AttributeError(msg)
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")

qrcode/main.py

@@ -22,25 +22,25 @@ def make(data=None, **kwargs):
 
 def _check_box_size(size):
     if int(size) <= 0:
-        msg = f"Invalid box size (was {size}, expected larger than 0)"
-        raise ValueError(msg)
+        raise ValueError(f"Invalid box size (was {size}, expected larger than 0)")
 
 
 def _check_border(size):
     if int(size) < 0:
-        msg = f"Invalid border value (was {size}, expected 0 or larger than that)"
-        raise ValueError(msg)
+        raise ValueError(
+            f"Invalid border value (was {size}, expected 0 or larger than that)"
+        )
 
 
 def _check_mask_pattern(mask_pattern):
     if mask_pattern is None:
         return
     if not isinstance(mask_pattern, int):
-        msg = f"Invalid mask pattern (was {type(mask_pattern)}, expected int)"
-        raise TypeError(msg)
+        raise TypeError(
+            f"Invalid mask pattern (was {type(mask_pattern)}, expected int)"
+        )
     if mask_pattern < 0 or mask_pattern > 7:
-        msg = f"Mask pattern should be in range(8) (got {mask_pattern})"
-        raise ValueError(msg)
+        raise ValueError(f"Mask pattern should be in range(8) (got {mask_pattern})")
 
 
 def copy_2d_array(x):
@@ -258,8 +258,7 @@ def print_tty(self, out=None):
             out = sys.stdout
 
         if not out.isatty():
-            msg = "Not a tty"
-            raise OSError(msg)
+            raise OSError("Not a tty")
 
         if self.data_cache is None:
             self.make()
@@ -288,8 +287,7 @@ def print_ascii(self, out=None, tty=False, invert=False):
             out = sys.stdout
 
         if tty and not out.isatty():
-            msg = "Not a tty"
-            raise OSError(msg)
+            raise OSError("Not a tty")
 
         if self.data_cache is None:
             self.make()
@@ -354,8 +352,9 @@ def make_image(self, image_factory=None, **kwargs):
             or kwargs.get("embeded_image_path")
             or kwargs.get("embeded_image")
         ) and self.error_correction != constants.ERROR_CORRECT_H:
-            msg = "Error correction level must be ERROR_CORRECT_H if an embedded image is provided"
-            raise ValueError(msg)
+            raise ValueError(
+                "Error correction level must be ERROR_CORRECT_H if an embedded image is provided"
+            )
 
         _check_box_size(self.box_size)
         if self.data_cache is None:

qrcode/tests/test_script.py

@@ -7,8 +7,7 @@
 
 
 def bad_read():
-    msg = "utf-8"
-    raise UnicodeDecodeError(msg, b"0x80", 0, 1, "invalid start byte")
+    raise UnicodeDecodeError("utf-8", b"0x80", 0, 1, "invalid start byte")
 
 
 @mock.patch("os.isatty", return_value=True)