Dolda2000 GitWeb
/
wrw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into python2
[wrw.git]
/
wrw
/
proto.py
diff --git
a/wrw/proto.py
b/wrw/proto.py
index
a67fa19
..
7cb6d31
100644
(file)
--- a/
wrw/proto.py
+++ b/
wrw/proto.py
@@
-105,7
+105,7
@@
def urlq(url):
if isinstance(url, unicode):
url = url.encode("utf-8")
ret = ""
if isinstance(url, unicode):
url = url.encode("utf-8")
ret = ""
- invalid = ";&=#?/\"'"
+ invalid = "
%
;&=#?/\"'"
for c in url:
if c in invalid or (ord(c) <= 32) or (ord(c) >= 128):
ret += "%%%02X" % ord(c)
for c in url:
if c in invalid or (ord(c) <= 32) or (ord(c) >= 128):
ret += "%%%02X" % ord(c)
@@
-191,7
+191,7
@@
def parstring(pars={}, **augment):
def parurl(url, pars={}, **augment):
qs = parstring(pars, **augment)
if qs != "":
def parurl(url, pars={}, **augment):
qs = parstring(pars, **augment)
if qs != "":
- return url +
"?"
+ qs
+ return url +
("&" if "?" in url else "?")
+ qs
else:
return url
else:
return url