if isinstance(url, str):
url = url.encode("utf-8")
ret = ""
- invalid = b";&=#?/\"'"
+ invalid = b"%;&=#?/\"'"
for c in url:
if c in invalid or (c <= 32) or (c >= 128):
ret += "%%%02X" % c
def parurl(url, pars={}, **augment):
qs = parstring(pars, **augment)
if qs != "":
- return url + "?" + qs
+ return url + ("&" if "?" in url else "?") + qs
else:
return url