From 67480027f9bfc024365cb70436500afc84eb6432 Mon Sep 17 00:00:00 2001
From: Ryan Petrello <lists@ryanpetrello.com>
Date: Fri, 17 Jun 2011 10:35:35 -0400
Subject: [PATCH] Refining URL-decoding for positional "remainder"-type
 arguments.

---
 pecan/core.py      | 21 ++++++---------------
 tests/test_base.py | 16 ++++++----------
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/pecan/core.py b/pecan/core.py
index 3bca523..8650b2d 100644
--- a/pecan/core.py
+++ b/pecan/core.py
@@ -250,10 +250,14 @@ class Pecan(object):
         Determines the arguments for a controller based upon parameters
         passed the argument specification for the controller.
         '''
-        
         args = []
         kwargs = dict()
         valid_args = argspec[0][1:]
+
+        def _decode(x):
+            return urllib.unquote_plus(x) if isinstance(x, basestring) else x
+    
+        remainder = [_decode(x) for x in remainder]
         
         if im_self is not None:
             args.append(im_self)
@@ -296,20 +300,7 @@ class Pecan(object):
                 if name not in argspec[0]:
                     kwargs[name] = value
         
-        # urldecode() the args and kwargs and return them
-        return (
-            map(lambda x: 
-                urllib.unquote_plus(x) if isinstance(x, basestring) else x,
-                args
-            ),
-            dict(map(
-                lambda x: (
-                    x[0],
-                    urllib.unquote_plus(x[1]) if isinstance(x[1], basestring) else x[1]
-                ),
-                kwargs.items()
-            ))
-        )
+        return args, kwargs
     
     def render(self, template, namespace):
         renderer = self.renderers.get(self.default_renderer, self.template_path)
diff --git a/tests/test_base.py b/tests/test_base.py
index 3e15a71..448f853 100644
--- a/tests/test_base.py
+++ b/tests/test_base.py
@@ -237,7 +237,7 @@ class TestBase(TestCase):
 
         r = app.post('/multiple', {'one': 'Five%20', 'two': 'Six%20%21'})
         assert r.status_int == 200
-        assert r.body == 'multiple: Five , Six !'
+        assert r.body == 'multiple: Five%20, Six%20%21'
         
         # optional arg
         
@@ -278,7 +278,7 @@ class TestBase(TestCase):
 
         r = app.post('/optional', {'id': 'Some%20Number'})
         assert r.status_int == 200
-        assert r.body == 'optional: Some Number'
+        assert r.body == 'optional: Some%20Number'
         
         r = app.post('/optional/5', {'id': 'five'})
         assert r.status_int == 200
@@ -302,7 +302,7 @@ class TestBase(TestCase):
 
         r = app.post('/optional', {'id': 'Some%20Number', 'dummy': 'dummy'})
         assert r.status_int == 200
-        assert r.body == 'optional: Some Number'
+        assert r.body == 'optional: Some%20Number'
         
         # multiple optional args
         
@@ -351,7 +351,7 @@ class TestBase(TestCase):
 
         r = app.post('/multiple_optional', {'one': 'One%21'})
         assert r.status_int == 200
-        assert r.body == 'multiple_optional: One!, None, None'
+        assert r.body == 'multiple_optional: One%21, None, None'
         
         r = app.post('/multiple_optional/1', {'one': 'one'})
         assert r.status_int == 200
@@ -375,7 +375,7 @@ class TestBase(TestCase):
 
         r = app.post('/multiple_optional', {'one': 'One%21', 'two': 'Two%21', 'three': 'Three%21', 'four': '4'})
         assert r.status_int == 200
-        assert r.body == 'multiple_optional: One!, Two!, Three!'
+        assert r.body == 'multiple_optional: One%21, Two%21, Three%21'
         
         r = app.get('/multiple_optional?three=3')
         assert r.status_int == 200
@@ -388,10 +388,6 @@ class TestBase(TestCase):
         r = app.get('/multiple_optional', {'two': '2'})
         assert r.status_int == 200
         assert r.body == 'multiple_optional: None, 2, None'
-
-        r = app.get('/multiple_optional', {'two': 'Two%21'})
-        assert r.status_int == 200
-        assert r.body == 'multiple_optional: None, Two!, None'
         
         # variable args
         
@@ -438,7 +434,7 @@ class TestBase(TestCase):
 
         r = app.post('/variable_kwargs', {'id': 'Three%21', 'dummy': 'This%20is%20a%20test'})
         assert r.status_int == 200
-        assert r.body == 'variable_kwargs: dummy=This is a test, id=Three!'
+        assert r.body == 'variable_kwargs: dummy=This%20is%20a%20test, id=Three%21'
         
         # variable args & keyword args