# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1508022251 -7200
# Node ID 0012a92689b87301026fc8b8ad1d502a7c9c8cc3
# Parent  843793de5ac04a507c904c676145cd59fa7918da# Parent  8a9321e164b9ae0d48cc05e83870a5e66b8f499e
Merged changes from the default branch.

diff -r 843793de5ac0 -r 0012a92689b8 imipweb/data.py
--- a/imipweb/data.py	Sat Oct 14 23:15:16 2017 +0200
+++ b/imipweb/data.py	Sun Oct 15 01:04:11 2017 +0200
@@ -960,7 +960,9 @@
 
     def as_datetime(self, with_time=True):
 
-        "Return a datetime for this object."
+        """
+        Return a datetime for this object if one is provided or can be produced.
+        """
 
         # Return any original datetime details.
 
@@ -970,9 +972,14 @@
         # Otherwise, construct a datetime.
 
         s, attr = self.as_datetime_item(with_time)
-        if s:
+        if not s:
+            return None
+
+        # An erroneous datetime will yield None as result.
+
+        try:
             return get_datetime(s, attr)
-        else:
+        except ValueError:
             return None
 
     def as_datetime_item(self, with_time=True):