Merge branch 'master' into powerdnsplugin_02
This commit is contained in:
commit
66183e6bdd
|
@ -321,7 +321,8 @@ class Certificate(db.Model):
|
||||||
|
|
||||||
@hybrid_property
|
@hybrid_property
|
||||||
def expired(self):
|
def expired(self):
|
||||||
if self.not_after <= arrow.utcnow():
|
# can't compare offset-naive and offset-aware datetimes
|
||||||
|
if arrow.Arrow.fromdatetime(self.not_after) <= arrow.utcnow():
|
||||||
return True
|
return True
|
||||||
|
|
||||||
@expired.expression
|
@expired.expression
|
||||||
|
|
Loading…
Reference in New Issue