Skip to content
Snippets Groups Projects
Unverified Commit f4936ab3 authored by JohannesGarm's avatar JohannesGarm Committed by GitHub
Browse files

Merge pull request #33 from BandwidthOnDemand/fix_get_discovery_internal_server_error

an http request should return bytes
parents a2df2a95 241daf9f
Branches
Tags
No related merge requests found
...@@ -46,7 +46,7 @@ class ModifiableResource(resource.Resource): ...@@ -46,7 +46,7 @@ class ModifiableResource(resource.Resource):
if self.representation is None: if self.representation is None:
# we haven't been given a representation yet # we haven't been given a representation yet
request.setResponseCode(500) request.setResponseCode(500)
return 'Resource has not yet been created/updated.' return b'Resource has not yet been created/updated.'
# check for if-modified-since header, and send 304 back if it is not been modified # check for if-modified-since header, and send 304 back if it is not been modified
msd_header = request.getHeader(IF_MODIFIED_SINCE) msd_header = request.getHeader(IF_MODIFIED_SINCE)
...@@ -55,7 +55,7 @@ class ModifiableResource(resource.Resource): ...@@ -55,7 +55,7 @@ class ModifiableResource(resource.Resource):
msd = datetime.datetime.strptime(msd_header, RFC850_FORMAT) msd = datetime.datetime.strptime(msd_header, RFC850_FORMAT)
if msd >= self.last_update_time: if msd >= self.last_update_time:
request.setResponseCode(304) request.setResponseCode(304)
return '' return b''
except ValueError: except ValueError:
pass # error parsing timestamp pass # error parsing timestamp
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment