Ruff cleanup: enforce PLW2901 (no loop/context var overwrite)

Author: dev-KingMaster

pypdf/_cmap.py

@@ -460,11 +460,11 @@ def build_font_width_map(
             # will consider width of char as avg(width)
             m = 0
             cpt = 0
-            for xx in w:
-                xx = xx.get_object()
-                if xx > 0:
-                    m += xx
-                    cpt += 1
+        for xx in w:
+            xx_val = xx.get_object()
+            if xx_val > 0:
+                m += xx_val
+                cpt += 1
             font_width_map["default"] = m / max(1, cpt)
         st = cast(int, ft["/FirstChar"])
         en = cast(int, ft["/LastChar"])

pypdf/_doc_common.py

@@ -391,8 +391,8 @@ def recursive_call(
                     return top, -1
                 return None, mi + ma
             for idx, kid in enumerate(cast(ArrayObject, node["/Kids"])):
-                kid = cast(DictionaryObject, kid.get_object())
-                n, i = recursive_call(kid, mi)
+                kid_obj = cast(DictionaryObject, kid.get_object())
+                n, i = recursive_call(kid_obj, mi)
                 if n is not None:  # page has just been found ...
                     if i < 0:  # ... just below!
                         return node, idx
@@ -612,8 +612,8 @@ def _build_field(
             states: list[str] = []
             retval[key][NameObject("/_States_")] = ArrayObject(states)
             for k in obj.get(FA.Kids, {}):
-                k = k.get_object()
-                for s in list(k["/AP"]["/N"].keys()):
+                k_obj = k.get_object()
+                for s in list(k_obj["/AP"]["/N"].keys()):
                     if s not in states:
                         states.append(s)
                 retval[key][NameObject("/_States_")] = ArrayObject(states)
@@ -641,8 +641,8 @@ def _check_kids(
         if PagesAttributes.KIDS in tree:
             # recurse down the tree
             for kid in tree[PagesAttributes.KIDS]:  # type: ignore
-                kid = kid.get_object()
-                self.get_fields(kid, retval, fileobj, stack)
+                kid_obj = kid.get_object()
+                self.get_fields(kid_obj, retval, fileobj, stack)
 
     def _write_field(self, fileobj: Any, field: Any, field_attributes: Any) -> None:
         field_attributes_tuple = FA.attributes()
@@ -771,16 +771,16 @@ def _get_inherited(obj: DictionaryObject, key: str) -> Any:
         else:
             kids = field.get("/Kids", ())
             for k in kids:
-                k = k.get_object()
-                if (k.get("/Subtype", "") == "/Widget") and ("/T" not in k):
+                k_obj = k.get_object()
+                if (k_obj.get("/Subtype", "") == "/Widget") and ("/T" not in k_obj):
                     # Kid that is just a widget, not a field:
-                    if "/P" in k:
-                        ret += [k["/P"].get_object()]
+                    if "/P" in k_obj:
+                        ret += [k_obj["/P"].get_object()]
                     else:
                         ret += [
                             p
                             for p in self.pages
-                            if k.indirect_reference in p.get("/Annots", "")
+                            if k_obj.indirect_reference in p.get("/Annots", "")
                         ]
         return [
             x
@@ -1317,9 +1317,9 @@ def xfa(self) -> Optional[dict[str, Any]]:
             i = iter(fields)
             for f in i:
                 tag = f
-                f = next(i)
-                if isinstance(f, IndirectObject):
-                    field = cast(Optional[EncodedStreamObject], f.get_object())
+                f_val = next(i)
+                if isinstance(f_val, IndirectObject):
+                    field = cast(Optional[EncodedStreamObject], f_val.get_object())
                     if field:
                         es = zlib.decompress(field._data)
                         retval[tag] = es

pypdf/_page.py

@@ -740,14 +740,14 @@ def _get_inline_images(self) -> dict[str, ImageFile]:
                 if k in {"/Length", "/L"}:  # no length is expected
                     continue
                 if isinstance(v, list):
-                    v = ArrayObject(
+                    translated_v = ArrayObject(
                         [self._translate_value_inline_image(k, x) for x in v]
                     )
                 else:
-                    v = self._translate_value_inline_image(k, v)
-                k = NameObject(_INLINE_IMAGE_KEY_MAPPING[k])
-                if k not in init:
-                    init[k] = v
+                    translated_v = self._translate_value_inline_image(k, v)
+                mapped_k = NameObject(_INLINE_IMAGE_KEY_MAPPING[k])
+                if mapped_k not in init:
+                    init[mapped_k] = translated_v
             ii["object"] = EncodedStreamObject.initialize_from_dictionary(init)
             extension, byte_stream, img = _xobj_to_image(ii["object"])
             files[f"~{num}~"] = ImageFile(
@@ -1231,13 +1231,13 @@ def _merge_page_writer(
             else:
                 trsf = Transformation(ctm)
             for a in cast(ArrayObject, page2[PG.ANNOTS]):
-                a = a.get_object()
-                aa = a.clone(
+                a_obj = a.get_object()
+                aa = a_obj.clone(
                     pdf,
                     ignore_fields=("/P", "/StructParent", "/Parent"),
                     force_duplicate=True,
                 )
-                r = cast(ArrayObject, a["/Rect"])
+                r = cast(ArrayObject, a_obj["/Rect"])
                 pt1 = trsf.apply_on((r[0], r[1]), True)
                 pt2 = trsf.apply_on((r[2], r[3]), True)
                 aa[NameObject("/Rect")] = ArrayObject(
@@ -1248,8 +1248,8 @@ def _merge_page_writer(
                         max(pt1[1], pt2[1]),
                     )
                 )
-                if "/QuadPoints" in a:
-                    q = cast(ArrayObject, a["/QuadPoints"])
+                if "/QuadPoints" in a_obj:
+                    q = cast(ArrayObject, a_obj["/QuadPoints"])
                     aa[NameObject("/QuadPoints")] = ArrayObject(
                         trsf.apply_on((q[0], q[1]), True)
                         + trsf.apply_on((q[2], q[3]), True)

pypdf/_text_extraction/_layout_mode/_fixed_width_page.py

@@ -191,8 +191,10 @@ def recurs_to_target_op(
             elif op == b"TD":
                 text_state_mgr.set_state_param(b"TL", -operands[1])
             elif op == b"T*":
-                operands = [0, -text_state_mgr.TL]
-            text_state_mgr.add_tm(operands)
+                operands_for_tm = [0, -text_state_mgr.TL]
+            else:
+                operands_for_tm = operands
+            text_state_mgr.add_tm(operands_for_tm)
         elif op == b"Tf":
             text_state_mgr.set_font(fonts[operands[0]], operands[1])
         else:  # handle Tc, Tw, Tz, TL, and Ts operators

pypdf/_text_extraction/_layout_mode/_font.py

@@ -64,9 +64,10 @@ def __post_init__(self) -> None:
             for d_font_idx, d_font in enumerate(
                 self.font_dictionary["/DescendantFonts"]
             ):
-                while isinstance(d_font, IndirectObject):
-                    d_font = d_font.get_object()
-                self.font_dictionary["/DescendantFonts"][d_font_idx] = d_font
+                d_font_val = d_font
+                while isinstance(d_font_val, IndirectObject):
+                    d_font_val = d_font_val.get_object()
+                self.font_dictionary["/DescendantFonts"][d_font_idx] = d_font_val
                 ord_map = {
                     ord(_target): _surrogate
                     for _target, _surrogate in self.char_map.items()
@@ -80,18 +81,18 @@ def __post_init__(self) -> None:
                 skip_count = 0
                 _w = d_font.get("/W", [])
                 for idx, w_entry in enumerate(_w):
-                    w_entry = w_entry.get_object()
+                    w_val = w_entry.get_object()
                     if skip_count:
                         skip_count -= 1
                         continue
-                    if not isinstance(w_entry, (int, float)):  # pragma: no cover
+                    if not isinstance(w_val, (int, float)):  # pragma: no cover
                         # We should never get here due to skip_count above. Add a
                         # warning and or use reader's "strict" to force an ex???
                         continue
                     # check for format (1): `int [int int int int ...]`
                     w_next_entry = _w[idx + 1].get_object()
                     if isinstance(w_next_entry, Sequence):
-                        start_idx, width_list = w_entry, w_next_entry
+                        start_idx, width_list = w_val, w_next_entry
                         self.width_map.update(
                             {
                                 ord_map[_cidx]: _width
@@ -112,7 +113,7 @@ def __post_init__(self) -> None:
                         _w[idx + 2].get_object(), (int, float)
                     ):
                         start_idx, stop_idx, const_width = (
-                            w_entry,
+                            w_val,
                             w_next_entry,
                             _w[idx + 2].get_object(),
                         )

pypdf/_writer.py

@@ -979,13 +979,13 @@ def update_page_form_field_values(
             logger_warning("No fields to update on this page", __name__)
             return
         for annotation in page[PG.ANNOTS]:  # type: ignore
-            annotation = cast(DictionaryObject, annotation.get_object())
-            if annotation.get("/Subtype", "") != "/Widget":
+            annotation_obj = cast(DictionaryObject, annotation.get_object())
+            if annotation_obj.get("/Subtype", "") != "/Widget":
                 continue
-            if "/FT" in annotation and "/T" in annotation:
-                parent_annotation = annotation
+            if "/FT" in annotation_obj and "/T" in annotation_obj:
+                parent_annotation = annotation_obj
             else:
-                parent_annotation = annotation.get(
+                parent_annotation = annotation_obj.get(
                     PG.PARENT, DictionaryObject()
                 ).get_object()
 
@@ -1098,17 +1098,17 @@ def reattach_fields(
         annotations = cast(ArrayObject, page["/Annots"])
         for idx, annotation in enumerate(annotations):
             is_indirect = isinstance(annotation, IndirectObject)
-            annotation = cast(DictionaryObject, annotation.get_object())
-            if annotation.get("/Subtype", "") == "/Widget" and "/FT" in annotation:
+            annotation_obj = cast(DictionaryObject, annotation.get_object())
+            if annotation_obj.get("/Subtype", "") == "/Widget" and "/FT" in annotation_obj:
                 if (
-                    "indirect_reference" in annotation.__dict__
-                    and annotation.indirect_reference in fields
+                    "indirect_reference" in annotation_obj.__dict__
+                    and annotation_obj.indirect_reference in fields
                 ):
                     continue
                 if not is_indirect:
-                    annotations[idx] = self._add_object(annotation)
-                fields.append(annotation.indirect_reference)
-                lst.append(annotation)
+                    annotations[idx] = self._add_object(annotation_obj)
+                fields.append(annotation_obj.indirect_reference)
+                lst.append(annotation_obj)
         return lst
 
     def clone_reader_document_root(self, reader: PdfReader) -> None:
@@ -1469,8 +1469,10 @@ def _write_pdf_structure(self, stream: StreamType) -> tuple[list[int], list[int]
                 object_positions.append(stream.tell())
                 stream.write(f"{idnum} 0 obj\n".encode())
                 if self._encryption and obj != self._encrypt_entry:
-                    obj = self._encryption.encrypt_object(obj, idnum, 0)
-                obj.write_to_stream(stream)
+                    obj_to_write = self._encryption.encrypt_object(obj, idnum, 0)
+                else:
+                    obj_to_write = obj
+                obj_to_write.write_to_stream(stream)
                 stream.write(b"\nendobj\n")
             else:
                 object_positions.append(-1)
@@ -1560,8 +1562,10 @@ def add_metadata(self, infos: dict[str, Any]) -> None:
             infos = cast(DictionaryObject, infos.get_object())
         for key, value in list(infos.items()):
             if isinstance(value, PdfObject):
-                value = value.get_object()
-            args[NameObject(key)] = create_string_object(str(value))
+                value_obj = value.get_object()
+            else:
+                value_obj = value
+            args[NameObject(key)] = create_string_object(str(value_obj))
         if self._info is None:
             self._info = DictionaryObject()
         self._info.update(args)

pypdf/filters.py

@@ -760,27 +760,26 @@ def decode_stream_data(stream: Any) -> bytes:
     if not data:
         return data
     for filter_name, params in zip(filters, decode_parms):
-        if isinstance(params, NullObject):
-            params = {}
+        params_obj = {} if isinstance(params, NullObject) else params
         if filter_name in (FT.ASCII_HEX_DECODE, FTA.AHx):
             data = ASCIIHexDecode.decode(data)
         elif filter_name in (FT.ASCII_85_DECODE, FTA.A85):
             data = ASCII85Decode.decode(data)
         elif filter_name in (FT.LZW_DECODE, FTA.LZW):
-            data = LZWDecode.decode(data, params)
+            data = LZWDecode.decode(data, params_obj)
         elif filter_name in (FT.FLATE_DECODE, FTA.FL):
-            data = FlateDecode.decode(data, params)
+            data = FlateDecode.decode(data, params_obj)
         elif filter_name in (FT.RUN_LENGTH_DECODE, FTA.RL):
             data = RunLengthDecode.decode(data)
         elif filter_name == FT.CCITT_FAX_DECODE:
             height = stream.get(IA.HEIGHT, ())
-            data = CCITTFaxDecode.decode(data, params, height)
+            data = CCITTFaxDecode.decode(data, params_obj, height)
         elif filter_name == FT.DCT_DECODE:
             data = DCTDecode.decode(data)
         elif filter_name == FT.JPX_DECODE:
             data = JPXDecode.decode(data)
         elif filter_name == FT.JBIG2_DECODE:
-            data = JBIG2Decode.decode(data, params)
+            data = JBIG2Decode.decode(data, params_obj)
         elif filter_name == "/Crypt":
             if "/Name" in params or "/Type" in params:
                 raise NotImplementedError(

pypdf/generic/_files.py

@@ -394,8 +394,8 @@ def _load(cls, catalog: DictionaryObject) -> Generator[EmbeddedFile]:
             for kid in cast(ArrayObject, container["/Kids"].get_object()):
                 # There might be further (nested) kids here.
                 # Wait for an example before evaluating an implementation.
-                kid = kid.get_object()
-                if "/Names" in kid:
-                    yield from cls._load_from_names(cast(ArrayObject, kid["/Names"]))
+                kid_obj = kid.get_object()
+                if "/Names" in kid_obj:
+                    yield from cls._load_from_names(cast(ArrayObject, kid_obj["/Names"]))
         if "/Names" in container:
             yield from cls._load_from_names(cast(ArrayObject, container["/Names"]))

pyproject.toml

@@ -173,7 +173,6 @@ ignore = [
     "PERF203", # `try`-`except` within a loop incurs performance overhead
     "PGH003",  # Use specific rule codes when ignoring type issues
     "PLW1510", # `subprocess.run` without explicit `check` argument
-    "PLW2901", # `with` statement variable `img` overwritten by assignment target
     "PT011",   # `pytest.raises(ValueError)` is too broad, set the `match`
     "PT012",   # `pytest.raises()` block should contain a single simple statement
     "PT014",   # Ruff bug: Duplicate of test case at index 1 in `@pytest_mark.parametrize`

tests/scripts/test_make_release.py

@@ -41,11 +41,11 @@ def test_strip_header(data, expected):
 def test_get_git_commits_since_tag():
     make_release = pytest.importorskip("make_release")
 
-    with open(COMMITS__VERSION_4_0_1, mode="rb") as commits, mock.patch(
-        "urllib.request.urlopen", side_effect=lambda _: commits
+    with open(COMMITS__VERSION_4_0_1, mode="rb") as commits_fh, mock.patch(
+        "urllib.request.urlopen", side_effect=lambda _: commits_fh
     ), mock.patch("subprocess.check_output", return_value=GIT_LOG__VERSION_4_0_1):
-        commits = make_release.get_git_commits_since_tag("4.0.1")
-    assert commits == [
+        commits_list = make_release.get_git_commits_since_tag("4.0.1")
+    assert commits_list == [
         make_release.Change(
             commit_hash="b7bfd0d7eddfd0865a94cc9e7027df6596242cf7",
             prefix="BUG",