diff --git a/PyPDFForm/core/patterns.py b/PyPDFForm/core/patterns.py index c8ad3809..9570149d 100644 --- a/PyPDFForm/core/patterns.py +++ b/PyPDFForm/core/patterns.py @@ -5,13 +5,14 @@ from ..middleware.dropdown import Dropdown from ..middleware.radio import Radio from ..middleware.text import Text -from .constants import (ANNOTATION_FIELD_KEY, CHOICE_FIELD_IDENTIFIER, +from .constants import (ANNOTATION_FIELD_KEY, BUTTON_IDENTIFIER, + BUTTON_STYLE_IDENTIFIER, CHOICE_FIELD_IDENTIFIER, CHOICES_IDENTIFIER, FIELD_FLAG_KEY, PARENT_KEY, SELECTABLE_IDENTIFIER, SUBTYPE_KEY, TEXT_FIELD_ALIGNMENT_IDENTIFIER, TEXT_FIELD_APPEARANCE_IDENTIFIER, TEXT_FIELD_IDENTIFIER, WIDGET_SUBTYPE_KEY, - WIDGET_TYPE_KEY, BUTTON_STYLE_IDENTIFIER, BUTTON_IDENTIFIER) + WIDGET_TYPE_KEY) WIDGET_TYPE_PATTERNS = [ ( @@ -74,5 +75,5 @@ BUTTON_STYLE_PATTERNS = [ {BUTTON_IDENTIFIER: {BUTTON_STYLE_IDENTIFIER: True}}, - {PARENT_KEY: {BUTTON_IDENTIFIER: {BUTTON_STYLE_IDENTIFIER: True}}} + {PARENT_KEY: {BUTTON_IDENTIFIER: {BUTTON_STYLE_IDENTIFIER: True}}}, ] diff --git a/PyPDFForm/core/template.py b/PyPDFForm/core/template.py index f01598be..42bd6b83 100644 --- a/PyPDFForm/core/template.py +++ b/PyPDFForm/core/template.py @@ -10,9 +10,9 @@ from ..middleware.text import Text from .constants import (ANNOTATION_RECTANGLE_KEY, COMB, MULTILINE, NEW_LINE_SYMBOL, TEXT_FIELD_MAX_LENGTH_KEY) -from .patterns import (DROPDOWN_CHOICE_PATTERNS, TEXT_FIELD_FLAG_PATTERNS, - WIDGET_ALIGNMENT_PATTERNS, WIDGET_KEY_PATTERNS, - WIDGET_TYPE_PATTERNS, BUTTON_STYLE_PATTERNS) +from .patterns import (BUTTON_STYLE_PATTERNS, DROPDOWN_CHOICE_PATTERNS, + TEXT_FIELD_FLAG_PATTERNS, WIDGET_ALIGNMENT_PATTERNS, + WIDGET_KEY_PATTERNS, WIDGET_TYPE_PATTERNS) from .utils import find_pattern_match, stream_to_io, traverse_pattern diff --git a/PyPDFForm/core/utils.py b/PyPDFForm/core/utils.py index 8d65bef7..5179be5d 100644 --- a/PyPDFForm/core/utils.py +++ b/PyPDFForm/core/utils.py @@ -11,8 +11,9 @@ from ..middleware.constants import WIDGET_TYPES from ..middleware.radio import Radio from ..middleware.text import Text -from .constants import (DEFAULT_CHECKBOX_STYLE, BUTTON_STYLES, DEFAULT_FONT, DEFAULT_FONT_COLOR, - DEFAULT_FONT_SIZE, PREVIEW_FONT_COLOR, DEFAULT_RADIO_STYLE) +from .constants import (BUTTON_STYLES, DEFAULT_CHECKBOX_STYLE, DEFAULT_FONT, + DEFAULT_FONT_COLOR, DEFAULT_FONT_SIZE, + DEFAULT_RADIO_STYLE, PREVIEW_FONT_COLOR) def stream_to_io(stream: bytes) -> BinaryIO: diff --git a/PyPDFForm/middleware/template.py b/PyPDFForm/middleware/template.py index c6173dc0..b39ac711 100644 --- a/PyPDFForm/middleware/template.py +++ b/PyPDFForm/middleware/template.py @@ -3,12 +3,12 @@ from typing import Dict -from ..core.template import (construct_widget, get_character_x_paddings, - get_dropdown_choices, get_text_field_max_length, - get_widget_key, get_widgets_by_page, - is_text_field_comb, get_button_style) -from .constants import WIDGET_TYPES +from ..core.template import (construct_widget, get_button_style, + get_character_x_paddings, get_dropdown_choices, + get_text_field_max_length, get_widget_key, + get_widgets_by_page, is_text_field_comb) from .checkbox import Checkbox +from .constants import WIDGET_TYPES from .dropdown import Dropdown from .radio import Radio from .text import Text diff --git a/tests/test_create_widget.py b/tests/test_create_widget.py index 06c40ba9..f19b18b4 100644 --- a/tests/test_create_widget.py +++ b/tests/test_create_widget.py @@ -82,9 +82,7 @@ def test_create_checkbox_complex(template_stream, pdf_samples, request): def test_create_checkbox_check(template_stream, pdf_samples, request): - expected_path = os.path.join( - pdf_samples, "widget", "create_checkbox_check.pdf" - ) + expected_path = os.path.join(pdf_samples, "widget", "create_checkbox_check.pdf") with open(expected_path, "rb+") as f: obj = PdfWrapper(template_stream).create_widget( "checkbox", @@ -106,9 +104,7 @@ def test_create_checkbox_check(template_stream, pdf_samples, request): def test_create_checkbox_circle(template_stream, pdf_samples, request): - expected_path = os.path.join( - pdf_samples, "widget", "create_checkbox_circle.pdf" - ) + expected_path = os.path.join(pdf_samples, "widget", "create_checkbox_circle.pdf") with open(expected_path, "rb+") as f: obj = PdfWrapper(template_stream).create_widget( "checkbox", @@ -130,9 +126,7 @@ def test_create_checkbox_circle(template_stream, pdf_samples, request): def test_create_checkbox_cross(template_stream, pdf_samples, request): - expected_path = os.path.join( - pdf_samples, "widget", "create_checkbox_cross.pdf" - ) + expected_path = os.path.join(pdf_samples, "widget", "create_checkbox_cross.pdf") with open(expected_path, "rb+") as f: obj = PdfWrapper(template_stream).create_widget( "checkbox",