summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rossi <chris@archimedeanco.com>2014-07-16 09:10:25 -0400
committerChris Rossi <chris@archimedeanco.com>2014-07-16 09:10:25 -0400
commitdc97173e0c7306792814e3fa44dc0cd8e0e493b9 (patch)
treef3f0a00cc9abd89ea1dda843450171f00b2764a3
parent5350158f666a638293bd2b3d7cd19029e0bab145 (diff)
downloadpyramid-dc97173e0c7306792814e3fa44dc0cd8e0e493b9.tar.gz
pyramid-dc97173e0c7306792814e3fa44dc0cd8e0e493b9.tar.bz2
pyramid-dc97173e0c7306792814e3fa44dc0cd8e0e493b9.zip
Make sure md5 checksum works for non-package assets.
-rw-r--r--pyramid/static.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/pyramid/static.py b/pyramid/static.py
index 92251721e..290732640 100644
--- a/pyramid/static.py
+++ b/pyramid/static.py
@@ -160,8 +160,12 @@ def _secure_path(path_tuple):
def _generate_md5(spec):
package, filename = resolve_asset_spec(spec)
+ if package:
+ stream = pkg_resources.resource_stream(package, filename)
+ else:
+ stream = open(filename, 'rb')
md5 = hashlib.md5()
- with pkg_resources.resource_stream(package, filename) as stream:
+ with stream:
for block in iter(lambda: stream.read(4096), ''):
md5.update(block)
return md5.hexdigest()