diff options
| author | Michael Merickel <michael@merickel.org> | 2013-11-07 01:09:41 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2013-11-07 01:27:38 -0600 |
| commit | 86946fde64505c55424eed4cf891b8c4a98cefd3 (patch) | |
| tree | d332b1dd42046dba31da2c1b45499d460f8727af | |
| parent | cd5ab51eca5ca95c31eaa12192234938bc1435cb (diff) | |
| download | pyramid-86946fde64505c55424eed4cf891b8c4a98cefd3.tar.gz pyramid-86946fde64505c55424eed4cf891b8c4a98cefd3.tar.bz2 pyramid-86946fde64505c55424eed4cf891b8c4a98cefd3.zip | |
support encoding arbitrary query strings
| -rw-r--r-- | pyramid/url.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pyramid/url.py b/pyramid/url.py index fda2c72c7..2e3542161 100644 --- a/pyramid/url.py +++ b/pyramid/url.py @@ -222,7 +222,9 @@ class URLMethodsMixin(object): if '_query' in kw: query = kw.pop('_query') - if query: + if isinstance(query, text_type): + qs = '?' + native_(query) + elif query: qs = '?' + urlencode(query, doseq=True) if '_anchor' in kw: @@ -580,7 +582,9 @@ class URLMethodsMixin(object): if 'query' in kw: query = kw['query'] - if query: + if isinstance(query, text_type): + qs = '?' + native_(query) + elif query: qs = '?' + urlencode(query, doseq=True) if 'anchor' in kw: |