[tipfy] push by rodrigo.moraes - Raise an error if handler_method is passed to Rule when handler uses t... on 2011-03-20 21:40 GMT

[ti...@googlecode.com]

Revision: 34f22ab5fda6
Author: Rodrigo Moraes <rodrigo...@gmail.com>
Date: Sun Mar 20 14:40:06 2011
Log: Raise an error if handler_method is passed to Rule when handler
uses the 'handler:method' format.
http://code.google.com/p/tipfy/source/detail?r=34f22ab5fda6

Modified:
/tipfy/routing.py

=======================================
--- /tipfy/routing.py Sun Mar 20 13:58:27 2011
+++ /tipfy/routing.py Sun Mar 20 14:40:06 2011
@@ -291,10 +291,15 @@
self.handler = handler or self.name
self.handler_method = handler_method
if isinstance(self.handler, basestring):
- parts = self.handler.rsplit(':', 1)
- self.handler = parts[0]
- if len(parts) > 1:
- self.handler_method = parts[1]
+ if handler_method and self.handler.find(':') != -1:
+ raise ValueError(
+ "If handler_method is defined in a Rule, handler "
+ "can't have a colon (got %r)." % self.handler)
+ else:
+ parts = self.handler.rsplit(':', 1)
+ self.handler = parts[0]
+ if len(parts) > 1:
+ self.handler_method = parts[1]

super(Rule, self).__init__(path, endpoint=self.name, **kwargs)