From ac6c3371d7f77499b46554ca5cfa756f7716a631 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Wed, 15 Feb 2012 23:00:09 +0000 Subject: __metaclass__ lossage: None makes a bad datetime object. Closes #193. svn path=/branches/tk161/; revision=4339 --- rpkid/rpki/irdb/models.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'rpkid/rpki/irdb/models.py') diff --git a/rpkid/rpki/irdb/models.py b/rpkid/rpki/irdb/models.py index b8350a68..3c7ed103 100644 --- a/rpkid/rpki/irdb/models.py +++ b/rpkid/rpki/irdb/models.py @@ -81,8 +81,11 @@ class SundialField(django.db.models.DateTimeField): description = "A datetime type using our customized datetime objects" def to_python(self, value): - return rpki.sundial.datetime.fromdatetime( - django.db.models.DateTimeField.to_python(self, value)) + if isinstance(value, rpki.sundial.pydatetime.datetime): + return rpki.sundial.datetime.fromdatetime( + django.db.models.DateTimeField.to_python(self, value)) + else: + return value def get_prep_value(self, value): if isinstance(value, rpki.sundial.datetime): -- cgit v1.2.3