Automated merge with https://www.knowledgetap.com/hg/routes

--HG--
branch : trunk

1 files changed, 5 insertions, 1 deletions

diff --git a/routes/base.py b/routes/base.py
index 0b69d41..ca11bc9 100644
--- a/routes/base.py
+++ b/routes/base.py
@@ -550,7 +550,11 @@ class Route(object):
                 url += '/'
             url += '?'
             fragments = []
-            for key in extras:
+            # don't assume the 'extras' set preserves order: iterate
+            # through the ordered kargs instead
+            for key in kargs:
+                if key not in extras:
+                    continue
                 if key == 'action' or key == 'controller':
                     continue
                 val = kargs[key]