Skip to content

Commit

Permalink
Sort header keys when making message
Browse files Browse the repository at this point in the history
  • Loading branch information
zimeon committed Dec 5, 2015
1 parent 5a96672 commit b502467
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions iiif/error.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,16 @@ def as_txt(self):
s += "parameter=%s\n" % self.parameter
if (self.code):
s += "code=%d\n\n" % self.code
for header in self.headers:
for header in sorted(self.headers):
s += "header %s=%s\n" % (header,self.headers[header])
return s

def __str__(self):
"""Default human readable version of IIIF error.
Intention is that image server implementations will use
image_server_response(api_version) instead
image_server_response(api_version) instead. Does not include
header values in output
"""
s = self.text if (self.text) else 'UNKNOWN_ERROR'
if (self.parameter):
Expand Down
2 changes: 1 addition & 1 deletion tests/test_error.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def test03_txt(self):
e = IIIFError()
msg = 'IIIF Image Server Error\n\nself.text\n\nparameter=unknown\ncode=500\n\n'
self.assertEqual( e.as_txt(), msg )
e = IIIFError(headers={'a':'b','cc':'dd'})
e = IIIFError(headers={'cc':'dd','a':'b'})
self.assertEqual( e.as_txt(), msg + 'header a=b\nheader cc=dd\n')

def test04_image_server_response(self):
Expand Down

0 comments on commit b502467

Please sign in to comment.