From 170cbcdfb9d7cb08ec620b5643a8ab3384f3fc0c Mon Sep 17 00:00:00 2001
From: Jinge Li <9894243+chinapandaman@users.noreply.github.com>
Date: Sat, 13 Jul 2024 18:56:21 +0000
Subject: [PATCH] PPF-694: using a different var

---
 PyPDFForm/font.py      |  4 ++--
 PyPDFForm/template.py  |  4 ++--
 PyPDFForm/utils.py     | 16 ++++++++--------
 PyPDFForm/watermark.py |  4 ++--
 pyrightconfig.json     |  4 ++--
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/PyPDFForm/font.py b/PyPDFForm/font.py
index 34e2cc03..87ecba5c 100644
--- a/PyPDFForm/font.py
+++ b/PyPDFForm/font.py
@@ -42,9 +42,9 @@ def extract_font_from_text_appearance(text_appearance: str) -> Union[str, None]:
     appearance string of a text field widget.
     """
 
-    text_appearance = text_appearance.split(" ")
+    text_appearances = text_appearance.split(" ")
 
-    for each in text_appearance:
+    for each in text_appearances:
         if each.startswith("/"):
             text_segments = findall("[A-Z][^A-Z]*", each.replace("/", ""))
 
diff --git a/PyPDFForm/template.py b/PyPDFForm/template.py
index cedc2d61..0a4b839b 100644
--- a/PyPDFForm/template.py
+++ b/PyPDFForm/template.py
@@ -155,11 +155,11 @@ def update_text_field_attributes(
 def get_widgets_by_page(pdf: bytes) -> Dict[int, List[dict]]:
     """Iterates through a PDF and returns all widgets found grouped by page."""
 
-    pdf = PdfReader(stream_to_io(pdf))
+    pdf_file = PdfReader(stream_to_io(pdf))
 
     result = {}
 
-    for i, page in enumerate(pdf.pages):
+    for i, page in enumerate(pdf_file.pages):
         widgets = page.annotations
         result[i + 1] = []
         if widgets:
diff --git a/PyPDFForm/utils.py b/PyPDFForm/utils.py
index 42c18d75..f9e82f11 100644
--- a/PyPDFForm/utils.py
+++ b/PyPDFForm/utils.py
@@ -62,10 +62,10 @@ def preview_widget_to_draw(widget: WIDGET_TYPES) -> Text:
 def remove_all_widgets(pdf: bytes) -> bytes:
     """Removes all widgets from a PDF form."""
 
-    pdf = PdfReader(stream_to_io(pdf))
+    pdf_file = PdfReader(stream_to_io(pdf))
     result_stream = BytesIO()
     writer = PdfWriter()
-    for page in pdf.pages:
+    for page in pdf_file.pages:
         if page.annotations:
             page.annotations.clear()
         writer.add_page(page)
@@ -78,10 +78,10 @@ def remove_all_widgets(pdf: bytes) -> bytes:
 def get_page_streams(pdf: bytes) -> List[bytes]:
     """Returns a list of streams where each is a page of the input PDF."""
 
-    pdf = PdfReader(stream_to_io(pdf))
+    pdf_file = PdfReader(stream_to_io(pdf))
     result = []
 
-    for page in pdf.pages:
+    for page in pdf_file.pages:
         writer = PdfWriter()
         writer.add_page(page)
         with BytesIO() as f:
@@ -96,13 +96,13 @@ def merge_two_pdfs(pdf: bytes, other: bytes) -> bytes:
     """Merges two PDFs into one PDF."""
 
     output = PdfWriter()
-    pdf = PdfReader(stream_to_io(pdf))
-    other = PdfReader(stream_to_io(other))
+    pdf_file = PdfReader(stream_to_io(pdf))
+    other_file = PdfReader(stream_to_io(other))
     result = BytesIO()
 
-    for page in pdf.pages:
+    for page in pdf_file.pages:
         output.add_page(page)
-    for page in other.pages:
+    for page in other_file.pages:
         output.add_page(page)
 
     output.write(result)
diff --git a/PyPDFForm/watermark.py b/PyPDFForm/watermark.py
index c586bdc7..8fb58bf4 100644
--- a/PyPDFForm/watermark.py
+++ b/PyPDFForm/watermark.py
@@ -180,10 +180,10 @@ def merge_watermarks_with_pdf(
     """Merges watermarks with PDF."""
 
     result = BytesIO()
-    pdf = PdfReader(stream_to_io(pdf))
+    pdf_file = PdfReader(stream_to_io(pdf))
     output = PdfWriter()
 
-    for i, page in enumerate(pdf.pages):
+    for i, page in enumerate(pdf_file.pages):
         if watermarks[i]:
             watermark = PdfReader(stream_to_io(watermarks[i]))
             if watermark.pages:
diff --git a/pyrightconfig.json b/pyrightconfig.json
index 541e32b6..a93e89c1 100644
--- a/pyrightconfig.json
+++ b/pyrightconfig.json
@@ -1,7 +1,6 @@
 {
     "typeCheckingMode": "basic",
     "reportArgumentType": "none",
-    "reportAssignmentType": "none",
     "reportAttributeAccessIssue": "none",
     "reportOptionalSubscript": "none",
     "reportIndexIssue": "none",
@@ -14,5 +13,6 @@
     "reportMissingSuperCall": "error",
     "reportPrivateUsage": "error",
     "reportSelfClsParameterName": "error",
-    "reportReturnType": "error"
+    "reportReturnType": "error",
+    "reportAssignmentType": "error"
 }