Skip to content

Commit 945bd73

Browse files
author
black-isort-bot
committed
[skip ci]: black/isort
1 parent 7533c07 commit 945bd73

File tree

7 files changed

+46
-43
lines changed

7 files changed

+46
-43
lines changed

PyPDFForm/core/template.py

+17-8
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ def get_character_x_paddings(
388388
- float(element[TemplateCoreConstants().annotation_rectangle_key][2])
389389
)
390390
length = min(len(element_middleware.value or ""), element_middleware.max_length)
391-
391+
392392
char_rect_width = rect_width / element_middleware.max_length
393393

394394
result = []
@@ -397,9 +397,11 @@ def get_character_x_paddings(
397397
for char in (element_middleware.value or "")[:length]:
398398
current_mid_point = current_x + char_rect_width / 2
399399
result.append(
400-
current_mid_point - stringWidth(
400+
current_mid_point
401+
- stringWidth(
401402
char, element_middleware.font, element_middleware.font_size
402-
) / 2
403+
)
404+
/ 2
403405
)
404406
current_x += char_rect_width
405407

@@ -432,15 +434,15 @@ def get_draw_text_with_max_length_coordinates(
432434
string_width = element_middleware.character_paddings[-1] + stringWidth(
433435
element_middleware.value[:length][-1],
434436
element_middleware.font,
435-
element_middleware.font_size
437+
element_middleware.font_size,
436438
)
437439

438440
if int(alignment) == 1:
439441
x = width_mid_point - string_width / 2
440442
elif int(alignment) == 2:
441443
x = (
442444
float(element[TemplateCoreConstants().annotation_rectangle_key][2])
443-
- string_width
445+
- string_width
444446
)
445447

446448
string_height = element_middleware.font_size * 96 / 72
@@ -452,12 +454,19 @@ def get_draw_text_with_max_length_coordinates(
452454
return (
453455
x
454456
- (
455-
element_middleware.character_paddings[0] + stringWidth(
457+
element_middleware.character_paddings[0]
458+
+ stringWidth(
456459
element_middleware.value[:1],
457460
element_middleware.font,
458461
element_middleware.font_size,
459-
) / 2
460-
if (element_middleware.comb is True and length != 0 and length % 2 == 0 and int(alignment) == 1)
462+
)
463+
/ 2
464+
if (
465+
element_middleware.comb is True
466+
and length != 0
467+
and length % 2 == 0
468+
and int(alignment) == 1
469+
)
461470
else 0
462471
),
463472
(height_mid_point - string_height / 2 + height_mid_point) / 2,

PyPDFForm/core/watermark.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,11 @@ def draw_text(
4848
if element.comb is True:
4949
for i, char in enumerate(text_to_draw):
5050
canv.drawString(
51-
coordinate_x + element.character_paddings[i] + element.text_x_offset,
51+
coordinate_x
52+
+ element.character_paddings[i]
53+
+ element.text_x_offset,
5254
coordinate_y + element.text_y_offset,
53-
char
55+
char,
5456
)
5557
elif len(text_to_draw) < element.text_wrap_length:
5658
canv.drawString(

PyPDFForm/middleware/template.py

+7-3
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,20 @@ def build_elements(pdf_stream: bytes, sejda: bool = False) -> Dict[str, "Element
4444
return results
4545

4646
@staticmethod
47-
def set_character_x_paddings(pdf_stream: bytes, eles: Dict[str, "Element"]) -> Dict[str, "Element"]:
47+
def set_character_x_paddings(
48+
pdf_stream: bytes, eles: Dict[str, "Element"]
49+
) -> Dict[str, "Element"]:
4850
"""Sets paddings between characters for combed text fields."""
49-
51+
5052
for elements in TemplateCore().get_elements_by_page_v2(pdf_stream).values():
5153
for element in elements:
5254
key = TemplateCore().get_element_key_v2(element)
5355
_element = eles[key]
5456

5557
if _element.type == ElementType.text and _element.comb is True:
56-
_element.character_paddings = TemplateCore().get_character_x_paddings(element, _element)
58+
_element.character_paddings = (
59+
TemplateCore().get_character_x_paddings(element, _element)
60+
)
5761

5862
return eles
5963

PyPDFForm/middleware/wrapper.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -356,8 +356,10 @@ def fill(
356356
for key, value in data.items():
357357
if key in self.elements:
358358
self.elements[key].value = value
359-
360-
self.elements = TemplateMiddleware().set_character_x_paddings(self.stream, self.elements)
359+
360+
self.elements = TemplateMiddleware().set_character_x_paddings(
361+
self.stream, self.elements
362+
)
361363
self.stream = TemplateCore().remove_all_elements(
362364
FillerCore().fill_v2(self.stream, self.elements)
363365
)

tests/conftest.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,10 @@ def sample_template_with_comb_text_field(pdf_samples):
3636
@pytest.fixture
3737
def sample_template_with_comb_text_field_right_aligned(pdf_samples):
3838
with open(
39-
os.path.join(pdf_samples, "sample_template_with_comb_text_field_right_aligned.pdf"), "rb+"
39+
os.path.join(
40+
pdf_samples, "sample_template_with_comb_text_field_right_aligned.pdf"
41+
),
42+
"rb+",
4043
) as f:
4144
return f.read()
4245

tests/functional/scenario/test_existed.py

+4-20
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,7 @@ def test_illinois_gun_bill_of_sale(existed_pdf_directory):
5252

5353

5454
def test_ds82(existed_pdf_directory):
55-
obj = PyPDFForm2(
56-
os.path.join(
57-
existed_pdf_directory, "DS82.pdf"
58-
)
59-
).fill(
55+
obj = PyPDFForm2(os.path.join(existed_pdf_directory, "DS82.pdf")).fill(
6056
{
6157
"LastName": "Smith",
6258
}
@@ -75,11 +71,7 @@ def test_ds82(existed_pdf_directory):
7571

7672

7773
def test_ds82_all_chars_lowercase(existed_pdf_directory):
78-
obj = PyPDFForm2(
79-
os.path.join(
80-
existed_pdf_directory, "DS82.pdf"
81-
)
82-
).fill(
74+
obj = PyPDFForm2(os.path.join(existed_pdf_directory, "DS82.pdf")).fill(
8375
{
8476
"LastName": "x" * 30,
8577
}
@@ -98,11 +90,7 @@ def test_ds82_all_chars_lowercase(existed_pdf_directory):
9890

9991

10092
def test_ds82_all_chars_uppercase(existed_pdf_directory):
101-
obj = PyPDFForm2(
102-
os.path.join(
103-
existed_pdf_directory, "DS82.pdf"
104-
)
105-
).fill(
93+
obj = PyPDFForm2(os.path.join(existed_pdf_directory, "DS82.pdf")).fill(
10694
{
10795
"LastName": "X" * 30,
10896
}
@@ -121,11 +109,7 @@ def test_ds82_all_chars_uppercase(existed_pdf_directory):
121109

122110

123111
def test_ds82_mixed_case(existed_pdf_directory):
124-
obj = PyPDFForm2(
125-
os.path.join(
126-
existed_pdf_directory, "DS82.pdf"
127-
)
128-
).fill(
112+
obj = PyPDFForm2(os.path.join(existed_pdf_directory, "DS82.pdf")).fill(
129113
{
130114
"LastName": "xX" * 10,
131115
}

tests/functional/test_fill_max_length_text_field.py

+6-7
Original file line numberDiff line numberDiff line change
@@ -153,12 +153,8 @@ def test_fill_comb_text_field_even_chars(
153153
def test_fill_comb_text_field_void(
154154
sample_template_with_comb_text_field, expected_directory
155155
):
156-
with open(
157-
os.path.join(expected_directory, "comb_text_field_void.pdf"), "rb+"
158-
) as f:
159-
obj = PyPDFForm2(sample_template_with_comb_text_field).fill(
160-
{}
161-
)
156+
with open(os.path.join(expected_directory, "comb_text_field_void.pdf"), "rb+") as f:
157+
obj = PyPDFForm2(sample_template_with_comb_text_field).fill({})
162158

163159
expected = f.read()
164160

@@ -170,7 +166,10 @@ def test_fill_comb_text_field_even_chars_right_aligned(
170166
sample_template_with_comb_text_field_right_aligned, expected_directory
171167
):
172168
with open(
173-
os.path.join(expected_directory, "comb_text_field_even_chars_right_aligned.pdf"), "rb+"
169+
os.path.join(
170+
expected_directory, "comb_text_field_even_chars_right_aligned.pdf"
171+
),
172+
"rb+",
174173
) as f:
175174
obj = PyPDFForm2(sample_template_with_comb_text_field_right_aligned).fill(
176175
{

0 commit comments

Comments
 (0)