pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Also accept int values for check_lastmodified

Browse source
This commit is contained in:
Gina Häußge 2016-09-20 14:32:19 +02:00
parent b8159cf16f
commit 234cb501e7
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/octoprint/server/util/flask.py
View file

@ -898,10 +898,13 @@ def check_etag(etag):
def check_lastmodified(lastmodified):
if isinstance(lastmodified, float):
from datetime import datetime
from datetime import datetime
if isinstance(lastmodified, (float, int)):
lastmodified = datetime.fromtimestamp(lastmodified).replace(microsecond=0)
if not isinstance(lastmodified, datetime):
raise ValueError("lastmodified must be a datetime or float or int instance but, got {} instead".format(lastmodified.__class__))
return flask.request.method in ("GET", "HEAD") and \
flask.request.if_modified_since is not None and \
lastmodified >= flask.request.if_modified_since