DEV: Remove ignore Ruff rule RET505 (#3210)

RET505: Unnecessary "else" after "return" statement.

Author: j-t-1

pypdf/_cmap.py

@@ -211,8 +211,7 @@ def _parse_to_unicode(
     if "/ToUnicode" not in ft:
         if ft.get("/Subtype", "") == "/Type1":
             return _type1_alternative(ft, map_dict, int_entry)
-        else:
-            return {}, []
+        return {}, []
     process_rg: bool = False
     process_char: bool = False
     multiline_rg: Union[

pypdf/_doc_common.py

@@ -352,11 +352,10 @@ def get_num_pages(self) -> int:
         # the original method (flattened page count) is used.
         if self.is_encrypted:
             return self.root_object["/Pages"]["/Count"]  # type: ignore
-        else:
-            if self.flattened_pages is None:
-                self._flatten(self._readonly)
-            assert self.flattened_pages is not None
-            return len(self.flattened_pages)
+        if self.flattened_pages is None:
+            self._flatten(self._readonly)
+        assert self.flattened_pages is not None
+        return len(self.flattened_pages)
 
     def get_page(self, page_number: int) -> PageObject:
         """
@@ -585,16 +584,15 @@ def get_fields(
     def _get_qualified_field_name(self, parent: DictionaryObject) -> str:
         if "/TM" in parent:
             return cast(str, parent["/TM"])
-        elif "/Parent" in parent:
+        if "/Parent" in parent:
             return (
                 self._get_qualified_field_name(
                     cast(DictionaryObject, parent["/Parent"])
                 )
                 + "."
                 + cast(str, parent.get("/T", ""))
             )
-        else:
-            return cast(str, parent.get("/T", ""))
+        return cast(str, parent.get("/T", ""))
 
     def _build_field(
         self,
@@ -713,12 +711,11 @@ def get_form_text_fields(self, full_qualified_name: bool = False) -> Dict[str, A
         def indexed_key(k: str, fields: Dict[Any, Any]) -> str:
             if k not in fields:
                 return k
-            else:
-                return (
-                    k
-                    + "."
-                    + str(sum(1 for kk in fields if kk.startswith(k + ".")) + 2)
-                )
+            return (
+                k
+                + "."
+                + str(sum(1 for kk in fields if kk.startswith(k + ".")) + 2)
+            )
 
         # Retrieve document form fields
         formfields = self.get_fields()
@@ -759,12 +756,11 @@ def get_pages_showing_field(
         def _get_inherited(obj: DictionaryObject, key: str) -> Any:
             if key in obj:
                 return obj[key]
-            elif "/Parent" in obj:
+            if "/Parent" in obj:
                 return _get_inherited(
                     cast(DictionaryObject, obj["/Parent"].get_object()), key
                 )
-            else:
-                return None
+            return None
 
         try:
             # to cope with all types
@@ -824,7 +820,7 @@ def open_destination(
             oa = oa.decode()
         if isinstance(oa, str):
             return create_string_object(oa)
-        elif isinstance(oa, ArrayObject):
+        if isinstance(oa, ArrayObject):
             try:
                 page, typ, *array = oa
                 fit = Fit(typ, tuple(array))
@@ -907,8 +903,7 @@ def threads(self) -> Optional[ArrayObject]:
         catalog = self.root_object
         if CO.THREADS in catalog:
             return cast("ArrayObject", catalog[CO.THREADS])
-        else:
-            return None
+        return None
 
     @abstractmethod
     def _get_page_number_by_indirect(
@@ -961,18 +956,17 @@ def _build_destination(
         ):
             page = NullObject()
             return Destination(title, page, Fit.fit())
-        else:
-            page, typ, *array = array  # type: ignore
-            try:
-                return Destination(title, page, Fit(fit_type=typ, fit_args=array))  # type: ignore
-            except PdfReadError:
-                logger_warning(f"Unknown destination: {title} {array}", __name__)
-                if self.strict:
-                    raise
-                # create a link to first Page
-                tmp = self.pages[0].indirect_reference
-                indirect_reference = NullObject() if tmp is None else tmp
-                return Destination(title, indirect_reference, Fit.fit())
+        page, typ, *array = array  # type: ignore
+        try:
+            return Destination(title, page, Fit(fit_type=typ, fit_args=array))  # type: ignore
+        except PdfReadError:
+            logger_warning(f"Unknown destination: {title} {array}", __name__)
+            if self.strict:
+                raise
+            # create a link to first Page
+            tmp = self.pages[0].indirect_reference
+            indirect_reference = NullObject() if tmp is None else tmp
+            return Destination(title, indirect_reference, Fit.fit())
 
     def _build_outline_item(self, node: DictionaryObject) -> Optional[Destination]:
         dest, title, outline_item = None, None, None

pypdf/_page.py

@@ -603,8 +603,7 @@ def _get_ids_image(
         _i = getattr(obj, "indirect_reference", None)
         if _i in call_stack:
             return []
-        else:
-            call_stack.append(_i)
+        call_stack.append(_i)
         if self.inline_images is None:
             self.inline_images = self._get_inline_images()
         if obj is None:
@@ -663,9 +662,9 @@ def _get_image(
                 image=imgd[2],
                 indirect_reference=xobjs[id].indirect_reference,
             )
-        else:  # in a sub object
-            ids = id[1:]
-            return self._get_image(ids, cast(DictionaryObject, xobjs[id[0]]))
+        # in a sub object
+        ids = id[1:]
+        return self._get_image(ids, cast(DictionaryObject, xobjs[id[0]]))
 
     @property
     def images(self) -> VirtualListImages:
@@ -1028,10 +1027,8 @@ def _get_contents_as_bytes(self) -> Optional[bytes]:
             obj = self[PG.CONTENTS].get_object()
             if isinstance(obj, list):
                 return b"".join(x.get_object().get_data() for x in obj)
-            else:
-                return cast(EncodedStreamObject, obj).get_data()
-        else:
-            return None
+            return cast(EncodedStreamObject, obj).get_data()
+        return None
 
     def get_contents(self) -> Optional[ContentStream]:
         """
@@ -1050,10 +1047,8 @@ def get_contents(self) -> Optional[ContentStream]:
             obj = self[PG.CONTENTS].get_object()
             if isinstance(obj, NullObject):
                 return None
-            else:
-                return ContentStream(obj, pdf)
-        else:
-            return None
+            return ContentStream(obj, pdf)
+        return None
 
     def replace_contents(
         self, content: Union[None, ContentStream, EncodedStreamObject, ArrayObject]
@@ -1081,13 +1076,12 @@ def replace_contents(
         if is_null_or_none(content):
             if PG.CONTENTS not in self:
                 return
-            else:
-                assert self.indirect_reference is not None
-                assert self[PG.CONTENTS].indirect_reference is not None
-                self.indirect_reference.pdf._objects[
-                    self[PG.CONTENTS].indirect_reference.idnum - 1  # type: ignore
-                ] = NullObject()
-                del self[PG.CONTENTS]
+            assert self.indirect_reference is not None
+            assert self[PG.CONTENTS].indirect_reference is not None
+            self.indirect_reference.pdf._objects[
+                self[PG.CONTENTS].indirect_reference.idnum - 1  # type: ignore
+            ] = NullObject()
+            del self[PG.CONTENTS]
         elif not hasattr(self.get(PG.CONTENTS, None), "indirect_reference"):
             try:
                 self[NameObject(PG.CONTENTS)] = self.indirect_reference.pdf._add_object(
@@ -1693,12 +1687,11 @@ def page_number(self) -> Optional[int]:
         """
         if self.indirect_reference is None:
             return None
-        else:
-            try:
-                lst = self.indirect_reference.pdf.pages
-                return lst.index(self)
-            except ValueError:
-                return None
+        try:
+            lst = self.indirect_reference.pdf.pages
+            return lst.index(self)
+        except ValueError:
+            return None
 
     def _debug_for_extract(self) -> str:  # pragma: no cover
         out = ""
@@ -2472,8 +2465,7 @@ def _get_fonts(self) -> Tuple[Set[str], Set[str]]:
     def annotations(self) -> Optional[ArrayObject]:
         if "/Annots" not in self:
             return None
-        else:
-            return cast(ArrayObject, self["/Annots"])
+        return cast(ArrayObject, self["/Annots"])
 
     @annotations.setter
     def annotations(self, value: Optional[ArrayObject]) -> None:

pypdf/_page_labels.py

@@ -285,5 +285,4 @@ def nums_next(
     i = nums.index(key) + 2
     if i < len(nums):
         return (nums[i], nums[i + 1])
-    else:
-        return (None, None)
+    return (None, None)

pypdf/_text_extraction/__init__.py

@@ -79,12 +79,11 @@ def mult(m: List[float], n: List[float]) -> List[float]:
 def orient(m: List[float]) -> int:
     if m[3] > 1e-6:
         return 0
-    elif m[3] < -1e-6:
+    if m[3] < -1e-6:
         return 180
-    elif m[1] > 0:
+    if m[1] > 0:
         return 90
-    else:
-        return 270
+    return 270
 
 
 def crlf_space_check(

pypdf/_utils.py

@@ -472,12 +472,11 @@ def rename_kwargs(
 def _human_readable_bytes(bytes: int) -> str:
     if bytes < 10**3:
         return f"{bytes} Byte"
-    elif bytes < 10**6:
+    if bytes < 10**6:
         return f"{bytes / 10**3:.1f} kB"
-    elif bytes < 10**9:
+    if bytes < 10**9:
         return f"{bytes / 10**6:.1f} MB"
-    else:
-        return f"{bytes / 10**9:.1f} GB"
+    return f"{bytes / 10**9:.1f} GB"
 
 
 # The following class has been copied from Django:
@@ -594,12 +593,12 @@ def __lt__(self, other: Any) -> bool:
 
             if self_value < other_value:
                 return True
-            elif self_value > other_value:
+            if self_value > other_value:
                 return False
 
             if self_suffix < other_suffix:
                 return True
-            elif self_suffix > other_suffix:
+            if self_suffix > other_suffix:
                 return False
 
         return len(self.components) < len(other.components)

pypdf/_writer.py

@@ -599,8 +599,7 @@ def insert_page(
             raise ValueError("Invalid index value")
         if index >= len(self.flattened_pages):
             return self.add_page(page, excluded_keys)
-        else:
-            return self._add_page(page, index, excluded_keys)
+        return self._add_page(page, index, excluded_keys)
 
     def _get_page_number_by_indirect(
         self, indirect_reference: Union[None, int, NullObject, IndirectObject]
@@ -1962,8 +1961,7 @@ def add_named_destination_array(
                 named_dest.insert(i, destination)
                 named_dest.insert(i, TextStringObject(title))
                 return
-            else:
-                i += 2
+            i += 2
         named_dest.extend([TextStringObject(title), destination])
         return
 
@@ -2923,7 +2921,7 @@ def _get_cloned_page(
     ) -> Optional[IndirectObject]:
         if isinstance(page, NullObject):
             return None
-        elif isinstance(page, DictionaryObject) and page.get("/Type", "") == "/Page":
+        if isinstance(page, DictionaryObject) and page.get("/Type", "") == "/Page":
             _i = page.indirect_reference
         elif isinstance(page, IndirectObject):
             _i = page
@@ -3094,7 +3092,7 @@ def find_outline_item(
                 or o.get("/Title", None) == outline_item
             ):
                 return [i]
-            elif "/First" in o:
+            if "/First" in o:
                 res = self.find_outline_item(
                     outline_item, cast(OutlineType, o["/First"])
                 )
@@ -3301,19 +3299,17 @@ def _pdf_objectify(obj: Union[Dict[str, Any], str, float, List[Any]]) -> PdfObje
         for key, value in obj.items():
             to_add[NameObject(key)] = _pdf_objectify(value)
         return to_add
-    elif isinstance(obj, str):
+    if isinstance(obj, str):
         if obj.startswith("/"):
             return NameObject(obj)
-        else:
-            return TextStringObject(obj)
-    elif isinstance(obj, (float, int)):
+        return TextStringObject(obj)
+    if isinstance(obj, (float, int)):
         return FloatObject(obj)
-    elif isinstance(obj, list):
+    if isinstance(obj, list):
         return ArrayObject(_pdf_objectify(i) for i in obj)
-    else:
-        raise NotImplementedError(
-            f"{type(obj)=} could not be cast to a PdfObject"
-        )
+    raise NotImplementedError(
+        f"{type(obj)=} could not be cast to a PdfObject"
+    )
 
 
 def _create_outline_item(