summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Rukavina <marin@shinyshell.net>2012-04-27 23:52:32 +0200
committerMarin Rukavina <marin@shinyshell.net>2012-04-27 23:52:32 +0200
commit99e617c44d4f55041f2da31c81cff520d403b80a (patch)
tree335f0675f18a05757d5c123e9dee0847f562448c
parent2bae012e5e108c0a9a584aea0611b6a29e6027b0 (diff)
downloadpyramid-99e617c44d4f55041f2da31c81cff520d403b80a.tar.gz
pyramid-99e617c44d4f55041f2da31c81cff520d403b80a.tar.bz2
pyramid-99e617c44d4f55041f2da31c81cff520d403b80a.zip
Updated static_view to raise HTTP exceptions instead of returning
-rw-r--r--pyramid/static.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/pyramid/static.py b/pyramid/static.py
index dfb602ee0..63ca58597 100644
--- a/pyramid/static.py
+++ b/pyramid/static.py
@@ -101,17 +101,17 @@ class static_view(object):
path = _secure_path(path_tuple)
if path is None:
- return HTTPNotFound('Out of bounds: %s' % request.url)
+ raise HTTPNotFound('Out of bounds: %s' % request.url)
if self.package_name: # package resource
resource_path ='%s/%s' % (self.docroot.rstrip('/'), path)
if resource_isdir(self.package_name, resource_path):
if not request.path_url.endswith('/'):
- return self.add_slash_redirect(request)
+ self.add_slash_redirect(request)
resource_path = '%s/%s' % (resource_path.rstrip('/'),self.index)
if not resource_exists(self.package_name, resource_path):
- return HTTPNotFound(request.url)
+ raise HTTPNotFound(request.url)
filepath = resource_filename(self.package_name, resource_path)
else: # filesystem file
@@ -120,10 +120,10 @@ class static_view(object):
filepath = normcase(normpath(join(self.norm_docroot, path)))
if isdir(filepath):
if not request.path_url.endswith('/'):
- return self.add_slash_redirect(request)
+ self.add_slash_redirect(request)
filepath = join(filepath, self.index)
if not exists(filepath):
- return HTTPNotFound(request.url)
+ raise HTTPNotFound(request.url)
return FileResponse(filepath, request, self.cache_max_age)
@@ -132,7 +132,7 @@ class static_view(object):
qs = request.query_string
if qs:
url = url + '?' + qs
- return HTTPMovedPermanently(url)
+ raise HTTPMovedPermanently(url)
_seps = set(['/', os.sep])
def _contains_slash(item):