Allow per-method OPTIONS overrides

francoishill · Apr 13, 2015 · bf7abcb · bf7abcb
1 parent 9cd3b9c
commit bf7abcb
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/r2/r2/lib/base.py b/r2/r2/lib/base.py
@@ -121,10 +121,11 @@ def __call__(self, environ, start_response):
             if meth == 'HEAD':
                 meth = 'GET'
 
-            if meth != 'OPTIONS':
-                handler_name = meth + '_' + action
-            else:
+            if (meth == 'OPTIONS' and
+                    self._get_action_handler(action, meth) is None):
                 handler_name = meth
+            else:
+                handler_name = meth + '_' + action
 
             request.environ['pylons.routes_dict']['action_name'] = action
             request.environ['pylons.routes_dict']['action'] = handler_name