Dolda2000 GitWeb
/
wrw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow None in parurl values to omit keys.
[wrw.git]
/
wrw
/
proto.py
diff --git
a/wrw/proto.py
b/wrw/proto.py
index
628bfc9
..
70f8f77
100644
(file)
--- a/
wrw/proto.py
+++ b/
wrw/proto.py
@@
-168,11
+168,16
@@
def scripturl(req):
raise Exception("Malformed local part when reconstructing URL")
return siteurl(req) + req.uriname[1:]
raise Exception("Malformed local part when reconstructing URL")
return siteurl(req) + req.uriname[1:]
-def requrl(req):
+def requrl(req
, qs=True
):
s = siteurl(req)
if req.uri[0] != '/':
raise Exception("Malformed local part when reconstructing URL")
s = siteurl(req)
if req.uri[0] != '/':
raise Exception("Malformed local part when reconstructing URL")
- return siteurl(req) + req.uri[1:]
+ pf = req.uri[1:]
+ if not qs:
+ p = pf.find('?')
+ if not p < 0:
+ pf = pf[:p]
+ return siteurl(req) + pf
def parstring(pars={}, **augment):
buf = ""
def parstring(pars={}, **augment):
buf = ""
@@
-182,11
+187,15
@@
def parstring(pars={}, **augment):
del augment[key]
else:
val = pars[key]
del augment[key]
else:
val = pars[key]
+ if val is None:
+ continue
if buf != "": buf += "&"
buf += urlq(key) + "=" + urlq(str(val))
if buf != "": buf += "&"
buf += urlq(key) + "=" + urlq(str(val))
- for key in augment:
+ for key, val in augment.items():
+ if val is None:
+ continue
if buf != "": buf += "&"
if buf != "": buf += "&"
- buf += urlq(key) + "=" + urlq(str(
augment[key]
))
+ buf += urlq(key) + "=" + urlq(str(
val
))
return buf
def parurl(url, pars={}, **augment):
return buf
def parurl(url, pars={}, **augment):