Add utilty function to get the handler method for a request.

ghosthamlet · Nov 4, 2011 · 0ebeda5 · 0ebeda5
1 parent b57dff7
commit 0ebeda5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/r2/r2/controllers/reddit_base.py b/r2/r2/controllers/reddit_base.py
@@ -669,7 +669,7 @@ def check_cors(self):
 
         action = request.environ["pylons.routes_dict"]["action_name"]
 
-        handler = getattr(self, method + "_" + action, None)
+        handler = self._get_action_handler(action, method)
         cors = handler and getattr(handler, "cors_perms", None)
 
         if cors and cors["origin_check"](origin):

diff --git a/r2/r2/lib/base.py b/r2/r2/lib/base.py
@@ -118,6 +118,11 @@ def __call__(self, environ, start_response):
     def pre(self): pass
     def post(self): pass
 
+    def _get_action_handler(self, name=None, method=None):
+        name = name or request.environ["pylons.routes_dict"]["action_name"]
+        method = method or request.method
+        action = method + "_" + name
+        return getattr(self, action, None)
 
     @classmethod
     def format_output_url(cls, url, **kw):