closing: check self before parents

pypdfium2-team · Sep 25, 2022 · 47d5c78 · 47d5c78
1 parent fb62c5a
commit 47d5c78
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/src/pypdfium2/_helpers/document.py b/src/pypdfium2/_helpers/document.py
@@ -146,7 +146,9 @@ def __del__(self):
 
 
     def _skip_close(self):
-        return (self.raw is None)
+        if self.raw is None:
+            return True
+        return False
 
     def close(self):
         """
@@ -157,7 +159,7 @@ def close(self):
         """
 
         if self._skip_close():
-            return  # self is closed already, or exception on construction
+            return
 
         self.exit_formenv()
         pdfium.FPDF_CloseDocument(self.raw)
@@ -598,9 +600,11 @@ def __del__(self):
 
 
     def _skip_close(self):
+        if self.raw is None:
+            return True
         if self.pdf._skip_close():
             return True
-        return (self.raw is None)
+        return False
 
     def close(self):
         """

diff --git a/src/pypdfium2/_helpers/page.py b/src/pypdfium2/_helpers/page.py
@@ -50,9 +50,11 @@ def __del__(self):
 
 
     def _skip_close(self):
+        if self.raw is None:
+            return True
         if self.pdf._skip_close():
             return True
-        return (self.raw is None)
+        return False
 
     def close(self):
         """

diff --git a/src/pypdfium2/_helpers/textpage.py b/src/pypdfium2/_helpers/textpage.py
@@ -25,9 +25,11 @@ def __del__(self):
 
 
     def _skip_close(self):
+        if self.raw is None:
+            return True
         if self.page._skip_close():
             return True
-        return (self.raw is None)
+        return False
 
     def close(self):
         """
@@ -242,9 +244,11 @@ def __del__(self):
 
 
     def _skip_close(self):
+        if self.raw is None:
+            return True
         if self.textpage._skip_close():
             return True
-        return (self.raw is None)
+        return False
 
     def close(self):
         """