Merge "Replace assert statements with proper control-flow" into stable/juno

1 files changed, 7 insertions, 8 deletions

diff --git a/glance/api/middleware/cache.py b/glance/api/middleware/cache.py
index b72e44fdd..0c9e61f2b 100644
--- a/glance/api/middleware/cache.py
+++ b/glance/api/middleware/cache.py
@@ -83,16 +83,15 @@ class CacheFilter(wsgi.Middleware):
                  otherwise None
         """
         for ((version, method), pattern) in PATTERNS.items():
+            if request.method != method:
+                continue
             match = pattern.match(request.path_info)
-            try:
-                assert request.method == method
-                image_id = match.group(1)
-                # Ensure the image id we got looks like an image id to filter
-                # out a URI like /images/detail. See LP Bug #879136
-                assert image_id != 'detail'
-            except (AttributeError, AssertionError):
+            if match is None:
                 continue
-            else:
+            image_id = match.group(1)
+            # Ensure the image id we got looks like an image id to filter
+            # out a URI like /images/detail. See LP Bug #879136
+            if image_id != 'detail':
                 return (version, method, image_id)
 
     def _enforce(self, req, action, target=None):