summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Schetinin <sergey@maluke.com>2011-09-20 08:18:28 +0300
committerSergey Schetinin <sergey@maluke.com>2011-09-20 08:18:28 +0300
commit814ca5bbcb4c90f5c6579d2e75efa2bdc985c19f (patch)
tree7c87d85feefe164e2de8e6499aeb27c7a3b70a49
parentacd1dcceba7899206c0d6f9905265df2bc5b8c21 (diff)
downloadwebob-814ca5bbcb4c90f5c6579d2e75efa2bdc985c19f.tar.gz
don't special-case ETagMatcher.parse('*')
-rw-r--r--webob/etag.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/webob/etag.py b/webob/etag.py
index 46331b9..adac29a 100644
--- a/webob/etag.py
+++ b/webob/etag.py
@@ -17,8 +17,6 @@ def etag_property(key, default, rfc_section):
value = req.environ.get(key)
if not value:
return default
- elif value == '*':
- return AnyETag
else:
return ETagMatcher.parse(value)
def fset(req, val):
@@ -106,6 +104,8 @@ class ETagMatcher(object):
"""
Parse this from a header value
"""
+ if value == '*':
+ return AnyETag
results = []
weak_results = []
while value: