[svn] Fixed bug related to handling keyword argument controller.

--HG--
branch : trunk

2 files changed, 3 insertions, 1 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 354c37a..a539530 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@ Routes Changelog
 ========================
 
 -- 1.3.3 (**SVN**)
+* Fixed bug related to handling keyword argument controller.
 * Added URL generation handling for a 'method' argument. If 'method' is specified, it
   is not dropped and will be changed to '_method' for use by the framework.
 * Added conditions option to map.connect. Accepts a dict with optional keyword args
diff --git a/routes/base.py b/routes/base.py
index 9defe1e..4b578cd 100644
--- a/routes/base.py
+++ b/routes/base.py
@@ -754,7 +754,7 @@ class Mapper(object):
                 continue
         return None
     
-    def resource(self, controller, **kwargs):
+    def resource(self, controller_name, **kwargs):
         """Generate routes for a controller resource
         
         The controller should be the name of the controller for which a set
@@ -819,6 +819,7 @@ class Mapper(object):
                 # has named route "category_message"
         
         """
+        controller = controller_name
         collection = kwargs.pop('collection', {})
         member = kwargs.pop('member', {})
         new = kwargs.pop('new', {})