diff options
| author | Michael Merickel <michael@merickel.org> | 2013-08-13 15:22:07 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2013-08-13 15:22:07 -0500 |
| commit | a54d7d6f33904e925da27e74d34039f56b7b68e1 (patch) | |
| tree | f65ac51ff967e1d7108327491f7b30a8bd2b6894 | |
| parent | 8784f61e17d4cea13ae4974d9ef26a530bd84e35 (diff) | |
| download | pyramid-a54d7d6f33904e925da27e74d34039f56b7b68e1.tar.gz pyramid-a54d7d6f33904e925da27e74d34039f56b7b68e1.tar.bz2 pyramid-a54d7d6f33904e925da27e74d34039f56b7b68e1.zip | |
fix a regression with the current_route_url changes in #1081
| -rw-r--r-- | pyramid/url.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pyramid/url.py b/pyramid/url.py index b135c361a..3d95d7cc9 100644 --- a/pyramid/url.py +++ b/pyramid/url.py @@ -224,8 +224,6 @@ class URLMethodsMixin(object): query = kw.pop('_query') if query: qs = '?' + urlencode(query, doseq=True) - elif getattr(self, 'GET', None): - qs = '?' + urlencode(self.GET, doseq=True) if '_anchor' in kw: anchor = kw.pop('_anchor') @@ -684,6 +682,9 @@ class URLMethodsMixin(object): if route_name is None: raise ValueError('Current request matches no route') + if '_query' not in kw: + kw['_query'] = self.GET + newkw = {} newkw.update(self.matchdict) newkw.update(kw) |