Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

simplifying code

This commit is contained in:
Hossein Shafagh 2020-03-26 20:43:52 -07:00
parent e4e5bc056b
commit 2a2499a929
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lemur/certificates/models.py
View File

@ -8,8 +8,6 @@
from datetime import timedelta from datetime import timedelta
import arrow import arrow
import pytz
import datetime
from cryptography import x509 from cryptography import x509
from cryptography.hazmat.primitives.asymmetric import rsa from cryptography.hazmat.primitives.asymmetric import rsa
from flask import current_app from flask import current_app
@ -323,13 +321,9 @@ class Certificate(db.Model):
@hybrid_property @hybrid_property
def expired(self): def expired(self):
if isinstance(self.not_after, datetime.datetime): # can't compare offset-naive and offset-aware datetimes
# can't compare offset-naive and offset-aware datetimes if arrow.Arrow.fromdatetime(self.not_after) <= arrow.utcnow():
if self.not_after.replace(tzinfo=pytz.UTC) <= arrow.utcnow(): return True
return True
else:
if self.not_after <= arrow.utcnow():
return True
@expired.expression @expired.expression
def expired(cls): def expired(cls):