From 7290a6af41204762d0cacd0a75f825b649c08a73 Mon Sep 17 00:00:00 2001 From: Greg Kempe Date: Fri, 10 Jan 2020 12:48:42 +0200 Subject: [PATCH] Parsing and errors --- indigo_api/models/documents.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/indigo_api/models/documents.py b/indigo_api/models/documents.py index 65dace0d8..87a6b94db 100644 --- a/indigo_api/models/documents.py +++ b/indigo_api/models/documents.py @@ -16,7 +16,7 @@ from django.urls import reverse from django.utils import timezone from allauth.account.utils import user_display -from iso8601 import parse_date +from iso8601 import parse_date, ParseError from taggit.managers import TaggableManager import reversion.revisions import reversion.models @@ -90,7 +90,7 @@ def get_for_frbr_uri(self, frbr_uri): else: raise ValueError("The expression date %s is not valid" % expr_date) - except arrow.parser.ParserError: + except ParseError: raise ValueError("The expression date %s is not valid" % expr_date) obj = query.first() @@ -330,8 +330,8 @@ def copy_attributes(self, from_model=True): self.doc.language = self.language.code self.doc.work_date = self.doc.publication_date - self.doc.expression_date = self.expression_date or self.doc.publication_date or arrow.now() - self.doc.manifestation_date = self.updated_at or arrow.now() + self.doc.expression_date = self.expression_date or self.doc.publication_date or timezone.now() + self.doc.manifestation_date = self.updated_at or timezone.now() self.doc.publication_number = self.publication_number self.doc.publication_name = self.publication_name self.doc.publication_date = self.publication_date