PyPDFForm 1.4.15__py3-none-any.whl → 1.4.16__py3-none-any.whl

PyPDFForm/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 """Contains any object users might need."""
 
-__version__ = "1.4.15"
+__version__ = "1.4.16"
 
 from .wrapper import FormWrapper, PdfWrapper, PyPDFForm

PyPDFForm/constants.py

@@ -37,6 +37,7 @@ Ff = "/Ff"
 Tx = "/Tx"
 V = "/V"
 AP = "/AP"
+D = "/D"
 Sig = "/Sig"
 DA = "/DA"
 Btn = "/Btn"
@@ -47,6 +48,7 @@ Opt = "/Opt"
 MK = "/MK"
 CA = "/CA"
 AS = "/AS"
+Off = "/Off"
 
 # Field flag bits
 READ_ONLY = 1 << 0
@@ -70,6 +72,4 @@ BUTTON_STYLES = {
     "l": "\u25CF",  # circle
 }
 
-Yes = "/Yes"
-
 COORDINATE_GRID_FONT_SIZE_MARGIN_RATIO = DEFAULT_FONT_SIZE / 100

PyPDFForm/filler.py

@@ -158,7 +158,7 @@ def simple_fill(
                     radio_button_tracker[key] = 0
                 radio_button_tracker[key] += 1
                 if widget.value == radio_button_tracker[key] - 1:
-                    simple_update_radio_value(annot, widget)
+                    simple_update_radio_value(annot)
             elif isinstance(widget, Dropdown) and widget.value is not None:
                 simple_update_dropdown_value(annot, widget)
             elif isinstance(widget, Text) and widget.value:

PyPDFForm/patterns.py

@@ -4,8 +4,8 @@
 from pypdf.generic import (DictionaryObject, NameObject, NumberObject,
                            TextStringObject)
 
-from .constants import (AP, AS, CA, DA, FT, MK, READ_ONLY, Btn, Ch, Ff, Opt,
-                        Parent, Q, Sig, Subtype, T, Tx, V, Widget, Yes)
+from .constants import (AP, AS, CA, DA, FT, MK, READ_ONLY, Btn, Ch, D, Ff, Off,
+                        Opt, Parent, Q, Sig, Subtype, T, Tx, V, Widget)
 from .middleware.checkbox import Checkbox
 from .middleware.dropdown import Dropdown
 from .middleware.radio import Radio
@@ -83,27 +83,45 @@ BUTTON_STYLE_PATTERNS = [
 def simple_update_checkbox_value(annot: DictionaryObject) -> None:
     """Patterns to update values for checkbox annotations."""
 
-    annot[NameObject(AS)] = NameObject(Yes)
+    for each in annot[AP][D]:  # noqa
+        if str(each) != Off:
+            annot[NameObject(AS)] = NameObject(each)
+            break
 
 
-def simple_update_radio_value(annot: DictionaryObject, widget: Radio) -> None:
+def simple_update_radio_value(annot: DictionaryObject) -> None:
     """Patterns to update values for radio annotations."""
 
-    annot[NameObject(AS)] = NameObject(f"/{widget.value}")
+    for each in annot[AP][D]:  # noqa
+        if str(each) != Off:
+            annot[NameObject(AS)] = NameObject(each)
+            break
 
 
 def simple_update_dropdown_value(annot: DictionaryObject, widget: Dropdown) -> None:
     """Patterns to update values for dropdown annotations."""
 
-    annot[NameObject(V)] = TextStringObject(widget.choices[widget.value])
-    annot[NameObject(AP)] = TextStringObject(widget.choices[widget.value])
+    if Parent in annot and T not in annot:
+        annot[NameObject(Parent)][NameObject(V)] = TextStringObject(  # noqa
+            widget.choices[widget.value]
+        )
+        annot[NameObject(AP)] = TextStringObject(widget.choices[widget.value])
+    else:
+        annot[NameObject(V)] = TextStringObject(widget.choices[widget.value])
+        annot[NameObject(AP)] = TextStringObject(widget.choices[widget.value])
 
 
 def simple_update_text_value(annot: DictionaryObject, widget: Text) -> None:
     """Patterns to update values for text annotations."""
 
-    annot[NameObject(V)] = TextStringObject(widget.value)
-    annot[NameObject(AP)] = TextStringObject(widget.value)
+    if Parent in annot and T not in annot:
+        annot[NameObject(Parent)][NameObject(V)] = TextStringObject(  # noqa
+            widget.value
+        )
+        annot[NameObject(AP)] = TextStringObject(widget.value)
+    else:
+        annot[NameObject(V)] = TextStringObject(widget.value)
+        annot[NameObject(AP)] = TextStringObject(widget.value)
 
 
 def simple_flatten_radio(annot: DictionaryObject) -> None:
@@ -117,6 +135,11 @@ def simple_flatten_radio(annot: DictionaryObject) -> None:
 def simple_flatten_generic(annot: DictionaryObject) -> None:
     """Patterns to flatten generic annotations."""
 
-    annot[NameObject(Ff)] = NumberObject(
-        int(annot.get(NameObject(Ff), 0)) | READ_ONLY  # noqa
-    )
+    if Parent in annot and Ff not in annot:
+        annot[NameObject(Parent)][NameObject(Ff)] = NumberObject(  # noqa
+            int(annot.get(NameObject(Ff), 0)) | READ_ONLY  # noqa
+        )
+    else:
+        annot[NameObject(Ff)] = NumberObject(
+            int(annot.get(NameObject(Ff), 0)) | READ_ONLY  # noqa
+        )

{PyPDFForm-1.4.15.dist-info → PyPDFForm-1.4.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyPDFForm
-Version: 1.4.15
+Version: 1.4.16
 Summary: The Python library for PDF forms.
 Home-page: https://github.com/chinapandaman/PyPDFForm
 Author: Jinge Li

{PyPDFForm-1.4.15.dist-info → PyPDFForm-1.4.16.dist-info}/RECORD

@@ -1,11 +1,11 @@
-PyPDFForm/__init__.py,sha256=KgGvTymkLYyv87kBq8HFehcC47PtgmzHc1zc73Z526w,149
+PyPDFForm/__init__.py,sha256=G5VFxKnti5RCcw-SqAk6LjAGVJ9fEuPt1CYJQb0QMeA,149
 PyPDFForm/adapter.py,sha256=OgAIwcmukpBqHFBLymd3I7wA7wIdipRqgURZA2Y0Hgo,885
-PyPDFForm/constants.py,sha256=H-MBRnFhqvCrkVnwTCzYdt6ebe7rbUBTjzZl3GFdHtM,1431
+PyPDFForm/constants.py,sha256=D2lIBZllCdEcLVsSZ6fRGxEYFaTZj9Ex7ksDxbs7g44,1439
 PyPDFForm/coordinate.py,sha256=iOy_KEZO3DKsvwdclxZHLOJyrvbCVqJDK2UKmMpEM8E,7310
-PyPDFForm/filler.py,sha256=qobLLpYF79YZaHmZz_VbjLICebg-6xdQa4btNZO4Li4,6430
+PyPDFForm/filler.py,sha256=DdPGjVxkFNf1XqLmf-Qjr3xOFL0FX2afTCNC75JwJoc,6422
 PyPDFForm/font.py,sha256=y9vNvoaBfgkd5vz9EDp04ul8KDM2jY7J61-VWFng6GY,4155
 PyPDFForm/image.py,sha256=0GV8PFgY5oLJFHmhPD1fG-_5SBEO7jVLLtxCc_Uodfo,1143
-PyPDFForm/patterns.py,sha256=udF5Ka-ucEKgO13FvZ3VZv8mJbi-f-aAixAyJFR8cWI,2946
+PyPDFForm/patterns.py,sha256=3m_lJ3LmlHY0TxiqrrQzjUCDqrZvhIp9NbMQV1OH28o,3827
 PyPDFForm/template.py,sha256=fuoqiYD_4xQXrBgw8XC677EMxJzHaXb9NcVVYbf0r-0,11782
 PyPDFForm/utils.py,sha256=_gskLLNmwhfGF16gfMP00twVY6iYADYYAYWHMvKCDrg,4140
 PyPDFForm/watermark.py,sha256=clYdRqCuWEE25IL-BUHnSo4HgLkHPSOl7FUJLhbAfGg,4755
@@ -21,8 +21,8 @@ PyPDFForm/widgets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 PyPDFForm/widgets/base.py,sha256=Stq-oQt-cfwQ6nilQ4NqpO5udFSKDNb1mAwryrWggZA,2076
 PyPDFForm/widgets/checkbox.py,sha256=issx3onojq9plTHbNQwEnkbnhTo5vJKA5XSAoxRzQCg,264
 PyPDFForm/widgets/text.py,sha256=lUVlfQ-ndemSelsKNzY6nS4Kuf_H4mDPxotFMQFV-so,484
-PyPDFForm-1.4.15.dist-info/LICENSE,sha256=43awmYkI6opyTpg19me731iO1WfXZwViqb67oWtCsFY,1065
-PyPDFForm-1.4.15.dist-info/METADATA,sha256=63tamlVBtPHyMvkegLhDXBGlZ2Wp9qMQ_HTLCRRC9_o,5178
-PyPDFForm-1.4.15.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-PyPDFForm-1.4.15.dist-info/top_level.txt,sha256=GQQKuWqPUjT9YZqwK95NlAQzxjwoQrsxQ8ureM8lWOY,10
-PyPDFForm-1.4.15.dist-info/RECORD,,
+PyPDFForm-1.4.16.dist-info/LICENSE,sha256=43awmYkI6opyTpg19me731iO1WfXZwViqb67oWtCsFY,1065
+PyPDFForm-1.4.16.dist-info/METADATA,sha256=0AzKUrTQVCkTkdiX_qABWj2EwhnBzEJK51mQLWn7Ajs,5178
+PyPDFForm-1.4.16.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+PyPDFForm-1.4.16.dist-info/top_level.txt,sha256=GQQKuWqPUjT9YZqwK95NlAQzxjwoQrsxQ8ureM8lWOY,10
+PyPDFForm-1.4.16.dist-info/RECORD,,