summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hellkamp <marc@gsites.de>2016-07-05 13:35:48 +0200
committerMarcel Hellkamp <marc@gsites.de>2016-07-05 13:35:48 +0200
commitd7a3ca9bec7f937670929702416edb6cf91adc9b (patch)
tree26c36b054a180cc46eef4bcdd2e0e2fb78b752ea
parenteeaaef2733b75b6b98e5e6b781ab78b02f3bb220 (diff)
downloadbottle-feature-etag.tar.gz
Fix: Hashlib wants bytes, not unicode.feature-etag
-rw-r--r--bottle.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bottle.py b/bottle.py
index fd05aa0..a4052ac 100644
--- a/bottle.py
+++ b/bottle.py
@@ -2723,7 +2723,7 @@ def static_file(filename, root,
if etag is None:
etag = '%d:%d:%d:%d:%s' % (stats.st_dev, stats.st_ino, stats.st_mtime,
clen, filename)
- etag = hashlib.sha1(etag).hexdigest()
+ etag = hashlib.sha1(tob(etag)).hexdigest()
if etag:
headers['ETag'] = etag