Raise error if embedded image is provided and error correction is low…

…er than H
lincolnloop · Sep 27, 2024 · 68f3b29 · 68f3b29
1 parent ffa2b4a
commit 68f3b29
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/qrcode/main.py b/qrcode/main.py
@@ -345,8 +345,12 @@ def make_image(self, image_factory=None, **kwargs):
 
         If the data has not been compiled yet, make it first.
         """
-        if kwargs.get("embeded_image_path") and self.error_correction != constants.ERROR_CORRECT_H:
-            raise ValueError("Error correction level must be ERROR_CORRECT_H if an embedded image is provided")
+        if (
+            kwargs.get("embeded_image_path") or kwargs.get("embeded_image")
+        ) and self.error_correction != constants.ERROR_CORRECT_H:
+            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:
             self.make()

diff --git a/qrcode/tests/test_qrcode_pil.py b/qrcode/tests/test_qrcode_pil.py
@@ -52,7 +52,7 @@ def test_render_styled_Image():
 
 def test_render_styled_with_embeded_image():
     embeded_img = Image.new("RGB", (10, 10), color="red")
-    qr = qrcode.QRCode(error_correction=qrcode.ERROR_CORRECT_L)
+    qr = qrcode.QRCode(error_correction=qrcode.ERROR_CORRECT_H)
     qr.add_data(UNICODE_TEXT)
     img = qr.make_image(image_factory=StyledPilImage, embeded_image=embeded_img)
     img.save(io.BytesIO())
@@ -129,21 +129,28 @@ def test_embedded_image_and_error_correction(tmp_path):
     qr.add_data(UNICODE_TEXT)
     with pytest.raises(ValueError):
         qr.make_image(embeded_image_path=tmpfile)
+    with pytest.raises(ValueError):
+        qr.make_image(embeded_image=embedded_img)
 
     qr = qrcode.QRCode(error_correction=qrcode.ERROR_CORRECT_M)
     qr.add_data(UNICODE_TEXT)
     with pytest.raises(ValueError):
         qr.make_image(embeded_image_path=tmpfile)
+    with pytest.raises(ValueError):
+        qr.make_image(embeded_image=embedded_img)
 
     qr = qrcode.QRCode(error_correction=qrcode.ERROR_CORRECT_Q)
     qr.add_data(UNICODE_TEXT)
     with pytest.raises(ValueError):
         qr.make_image(embeded_image_path=tmpfile)
+    with pytest.raises(ValueError):
+        qr.make_image(embeded_image=embedded_img)
 
     # The only accepted correction level when an embedded image is provided
     qr = qrcode.QRCode(error_correction=qrcode.ERROR_CORRECT_H)
     qr.add_data(UNICODE_TEXT)
     qr.make_image(embeded_image_path=tmpfile)
+    qr.make_image(embeded_image=embedded_img)
 
 
 def test_shortcut():