diff options
author | pjenvey <none@none> | 2006-07-13 21:54:50 -0700 |
---|---|---|
committer | pjenvey <none@none> | 2006-07-13 21:54:50 -0700 |
commit | f1ab83b3821acd0f1b263883041a09405b076407 (patch) | |
tree | 652cf55942ba86c82683ae1d98995a94359d81cf /routes/base.py | |
parent | 42f1daa3c3e36d53b4c7a41f6e92fc4871926383 (diff) | |
download | routes-f1ab83b3821acd0f1b263883041a09405b076407.tar.gz |
[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
Diffstat (limited to 'routes/base.py')
-rw-r--r-- | routes/base.py | 5 |
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 + |