Fixed CreationDate of PDFs generated, that was broken - close #451

Author: Lucas-C

CHANGELOG.md

@@ -26,7 +26,7 @@
 from collections import OrderedDict, defaultdict
 from collections.abc import Sequence
 from contextlib import contextmanager
-from datetime import datetime
+from datetime import datetime, timezone
 from functools import wraps
 from math import isclose
 from os.path import splitext
@@ -434,15 +434,15 @@ def __init__(
         self.viewer_preferences = None
         self.compress = True  # Enable compression by default
         self.pdf_version = "1.3"  # Set default PDF version No.
+        self.creation_date = True
 
         self._current_draw_context = None
         self._drawing_graphics_state_registry = drawing.GraphicsStateDictRegistry()
         self._graphics_state_obj_refs = OrderedDict()
 
         self.record_text_quad_points = False
-        self.text_quad_points = defaultdict(
-            list
-        )  # page number -> array of 8 × n numbers
+        # page number -> array of 8 × n numbers:
+        self.text_quad_points = defaultdict(list)
 
     def _set_min_pdf_version(self, version):
         self.pdf_version = max(self.pdf_version, version)
@@ -681,7 +681,7 @@ def set_producer(self, producer):
 
     def set_creation_date(self, date=None):
         """Sets Creation of Date time, or current time if None given."""
-        self.creation_date = datetime.now() if date is None else date
+        self.creation_date = date
 
     def set_xmp_metadata(self, xmp_metadata):
         if "<?xpacket" in xmp_metadata[:50]:
@@ -3219,7 +3219,7 @@ def image(
             # disabling bandit rule as we just build a cache key, this is secure
             name, img = hashlib.md5(bytes).hexdigest(), name  # nosec B303 B324
         elif isinstance(name, io.BytesIO):
-            bytes = name.getvalue()
+            bytes = name.getvalue().strip()
             if _is_svg(bytes):
                 return self._vector_image(name, x, y, w, h, link, title, alt_text)
             # disabling bandit rule as we just build a cache key, this is secure
@@ -4151,17 +4151,18 @@ def _putinfo(self):
             "/Producer": enclose_in_parens(getattr(self, "producer", None)),
         }
 
-        if hasattr(self, "creation_date"):
+        if self.creation_date is True:
+            # => no date has been specified, we use the current time by default:
+            self.creation_date = datetime.now(timezone.utc)
+        if self.creation_date:
             try:
-                creation_date = self.creation_date
-                date_string = f"{creation_date:%Y%m%d%H%M%S}"
+                info_d["/CreationDate"] = enclose_in_parens(
+                    f"D:{self.creation_date:%Y%m%d%H%M%SZ%H'%M'}"
+                )
             except Exception as error:
                 raise FPDFException(
-                    f"Could not format date: {creation_date}"
+                    f"Could not format date: {self.creation_date}"
                 ) from error
-        else:
-            date_string = f"{datetime.now():%Y%m%d%H%M%S}"
-        info_d["/CreationDate"] = enclose_in_parens(f"D:{date_string}")
 
         self._out(pdf_dict(info_d, open_dict="", close_dict="", has_empty_fields=True))
 

fpdf/fpdf.py

@@ -66,7 +66,10 @@ def assert_pdf_equal(actual, expected, tmp_path, generate=False):
         actual_pdf = actual.pdf
     else:
         actual_pdf = actual
-    actual_pdf.set_creation_date(EPOCH)
+    if (
+        actual_pdf.creation_date is True
+    ):  # default value, meaning we are not testing .creation_date behaviour:
+        actual_pdf.set_creation_date(EPOCH)
     if generate:
         assert isinstance(expected, pathlib.Path), (
             "When passing `True` to `generate`"