Merge pull request #617 from chinapandaman/PPF-614

PPF-614: refine the pattern that determines a checkbox

Author: chinapandaman

PyPDFForm/constants.py

@@ -51,6 +51,7 @@
 MK = "/MK"
 CA = "/CA"
 AS = "/AS"
+Yes = "/Yes"
 Off = "/Off"
 
 # Field flag bits

PyPDFForm/patterns.py

@@ -6,7 +6,7 @@
 
 from .constants import (AP, AS, CA, DA, FT, IMAGE_FIELD_IDENTIFIER, JS, MK,
                         READ_ONLY, A, Btn, Ch, D, Ff, Off, Opt, Parent, Q, Sig,
-                        Subtype, T, Tx, V, Widget)
+                        Subtype, T, Tx, V, Widget, Yes)
 from .middleware.checkbox import Checkbox
 from .middleware.dropdown import Dropdown
 from .middleware.image import Image
@@ -28,7 +28,10 @@
         Text,
     ),
     (
-        ({FT: Btn},),
+        (
+            {FT: Btn},
+            {AS: (Yes, Off)},
+        ),
         Checkbox,
     ),
     (
@@ -47,11 +50,15 @@
         (
             {Parent: {FT: Btn}},
             {Parent: {Subtype: Widget}},
+            {AS: (Yes, Off)},
         ),
         Checkbox,
     ),
     (
-        ({Parent: {FT: Btn}},),
+        (
+            {Parent: {FT: Btn}},
+            {AS: (Yes, Off)},
+        ),
         Radio,
     ),
 ]

PyPDFForm/utils.py

@@ -122,7 +122,10 @@ def find_pattern_match(pattern: dict, widget: Union[dict, DictionaryObject]) ->
             ):
                 result = find_pattern_match(pattern[key], value)
             else:
-                result = pattern[key] == value
+                if isinstance(pattern[key], tuple):
+                    result = value in pattern[key]
+                else:
+                    result = pattern[key] == value
         if result:
             return result
     return False

pdf_samples/scenario/existed/ds11_pdf.pdf

@@ -184,3 +184,11 @@ def test_illinois_real_estate_power_of_attorney_form(existed_pdf_directory, requ
         expected = f.read()
         assert len(obj.read()) == len(expected)
         assert obj.read() == expected
+
+
+def test_clear_form_button_not_checkbox(existed_pdf_directory):
+    obj = PdfWrapper(
+        os.path.join(existed_pdf_directory, "ds11_pdf.pdf")
+    )
+
+    assert "Clear" not in obj.widgets