733c733
< def urlencode(query, doseq=False, safe='', encoding=None, errors=None):
---
> def urlencode(query, doseq=False, safe='', encoding=None, errors=None, quote_via=quote_plus):
744,745c744,745
<     string, the safe, encoding and error parameters are sent the quote_plus for
<     encoding.
---
>     string, the safe, encoding and error parameters are sent to the quote_via
>     function for encoding.
771c771
<                 k = quote_plus(k, safe)
---
>                 k = quote_via(k, safe)
773c773
<                 k = quote_plus(str(k), safe, encoding, errors)
---
>                 k = quote_via(str(k), safe, encoding, errors)
776c776
<                 v = quote_plus(v, safe)
---
>                 v = quote_via(v, safe)
778c778
<                 v = quote_plus(str(v), safe, encoding, errors)
---
>                 v = quote_via(str(v), safe, encoding, errors)
783c783
<                 k = quote_plus(k, safe)
---
>                 k = quote_via(k, safe)
785c785
<                 k = quote_plus(str(k), safe, encoding, errors)
---
>                 k = quote_via(str(k), safe, encoding, errors)
788c788
<                 v = quote_plus(v, safe)
---
>                 v = quote_via(v, safe)
791c791
<                 v = quote_plus(v, safe, encoding, errors)
---
>                 v = quote_via(v, safe, encoding, errors)
799c799
<                     v = quote_plus(str(v), safe, encoding, errors)
---
>                     v = quote_via(str(v), safe, encoding, errors)
805c805
<                             elt = quote_plus(elt, safe)
---
>                             elt = quote_via(elt, safe)
807c807
<                             elt = quote_plus(str(elt), safe, encoding, errors)
---
>                             elt = quote_via(str(elt), safe, encoding, errors)