[svn] don't assume Sets are ordered. One constructed viav1.4

Set(some_list) appears ordered in CPython, but won't be in
Jython/IronPython (resulting in test_generation.py errors)

--HG--
branch : trunk

1 files changed, 3 insertions, 2 deletions

diff --git a/routes/base.py b/routes/base.py
index 974f0a3..f5ddaab 100644
--- a/routes/base.py
+++ b/routes/base.py
@@ -436,7 +436,8 @@ class Route(object):
         extras = frozenset(kargs.keys()) - self.maxkeys
         if extras:
             url += '?'
-            url += urllib.urlencode([(key, kargs[key]) for key in extras if key != 'action' or key != 'controller'])
+            url += urllib.urlencode([(key, kargs[key]) for key in kargs if key in extras and \
+                                     (key != 'action' or key != 'controller')])
         return url
     
 
@@ -922,4 +923,4 @@ class Mapper(object):
         self.connect(name_prefix + controller, member_path, **route_options)
         self.connect("formatted_" + name_prefix + controller, member_path + ".:(format)",
             **route_options)
-    
\ No newline at end of file
+