Simplify/fix code after the recent fix for no. 1013

httpolice/header.py

@@ -206,7 +206,7 @@ def __contains__(self, other):
     def _compare(self, other, op):
         # It would be nice to be able to compare headers by values, as in::
         #
-        #   response.headers.etag == request.headers.if_match
+        #   resp.headers.last_modified == req.headers.if_modified_since
         #
         # Unfortunately, there are places
         # (such as :meth:`httpolice.blackboard.Blackboard.complain`)
@@ -218,7 +218,7 @@ def _compare(self, other, op):
         #
         # Now, the following form still works::
         #
-        #   response.headers.etag == request.headers.if_match.value
+        #   resp.headers.last_modified == req.headers.if_modified_since.value
         #
         # so we don't lose all that much.
 

httpolice/request.py

@@ -298,9 +298,8 @@ def check_request(req):
         if x.item in [cc.x_gzip, cc.x_compress] and x.param is not None:
             complain(1116, coding=x.item)
 
-    if headers.if_match.is_okay and headers.if_match != u'*':
-        if any(tag.weak for tag in headers.if_match):
-            complain(1120)
+    if headers.if_match != u'*' and any(tag.weak for tag in headers.if_match):
+        complain(1120)
 
     if method == m.HEAD:
         for hdr in headers:

httpolice/response.py

@@ -617,7 +617,7 @@ def check_response_in_context(resp, req):
             complain(1115)
 
     if method in [m.GET, m.HEAD] and status.successful:
-        if req.headers.if_none_match.is_okay and resp.headers.etag.is_okay:
+        if resp.headers.etag.is_okay:
             if req.headers.if_none_match == u'*':
                 # In this case we could ignore the presence of ``ETag``,
                 # but then we would need a separate notice
@@ -737,8 +737,7 @@ def check_response_in_context(resp, req):
 
     if resp.headers.preference_applied.is_present and \
             known.method.is_cacheable(method) and \
-            not (resp.headers.vary == u'*') and \
-            not (resp.headers.vary.is_okay and h.prefer in resp.headers.vary):
+            resp.headers.vary != u'*' and h.prefer not in resp.headers.vary:
             # We could also look for ``Cache-Control: no-store`` etc.,
             # but the meaning of ``Vary`` is not limited to caching,
             # and anyway this is just a mild comment.