From d837146b660334845f123dbef52264253c02fc9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Jaenisch?= Date: Mon, 23 May 2022 20:59:28 +0200 Subject: [PATCH] Make black happy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Jaenisch --- bookwyrm/importers/calibre_import.py | 4 ++-- bookwyrm/models/import_job.py | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bookwyrm/importers/calibre_import.py b/bookwyrm/importers/calibre_import.py index b9eb3da7..7395e2f7 100644 --- a/bookwyrm/importers/calibre_import.py +++ b/bookwyrm/importers/calibre_import.py @@ -15,8 +15,8 @@ class CalibreImporter(Importer): row_mappings_guesses = [] for field, mapping in self.row_mappings_guesses: - if field in ('date_added',): - row_mappings_guesses.append((field, mapping + ['timestamp'])) + if field in ("date_added",): + row_mappings_guesses.append((field, mapping + ["timestamp"])) else: row_mappings_guesses.append((field, mapping)) diff --git a/bookwyrm/models/import_job.py b/bookwyrm/models/import_job.py index 7ebac0e1..556f133f 100644 --- a/bookwyrm/models/import_job.py +++ b/bookwyrm/models/import_job.py @@ -175,7 +175,10 @@ class ImportItem(models.Model): def date_added(self): """when the book was added to this dataset""" if self.normalized_data.get("date_added"): - parsed_date_added = dateutil.parser.parse(self.normalized_data.get("date_added")) + parsed_date_added = dateutil.parser.parse( + self.normalized_data.get("date_added") + ) + if timezone.is_aware(parsed_date_added): # Keep timezone if import already had one return parsed_date_added