altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Pop command if it's found.

Browse source 
Only pop if the key is in the dict.  (Note: an alternate
implementation would have been pop(arg, '') except the QueryDict
doesn't implement that usage)
 - Legacy-Id: 347
This commit is contained in:
Bill Fenner 2007-06-12 20:49:09 +00:00
parent aa68d30e85
commit 57ab09459f
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ietf/redirects/views.py
View file

@ -12,6 +12,7 @@ def redirect(request, path="", script=""):
raise Http404 raise Http404
url = "/" + redir.url + "/" url = "/" + redir.url + "/"
(rest, remove) = (redir.rest, redir.remove) (rest, remove) = (redir.rest, redir.remove)
cmd = None
try: try:
cmd = redir.commands.all().get(command=request.REQUEST['command']) cmd = redir.commands.all().get(command=request.REQUEST['command'])
if cmd.url: if cmd.url:
@ -38,7 +39,11 @@ def redirect(request, path="", script=""):
# expecting and if there are any left, add them to the URL. # expecting and if there are any left, add them to the URL.
get = request.GET.copy() get = request.GET.copy()
for arg in re.findall(r'%\(([^)]+)\)', rest): for arg in re.findall(r'%\(([^)]+)\)', rest):
get.pop(arg) if get.has_key(arg):
get.pop(arg)
# If we found a command in the database, there's no need to pass it along.
if cmd and get.has_key('command'):
get.pop('command')
if get: if get:
url += '?' + get.urlencode() url += '?' + get.urlencode()
return HttpResponsePermanentRedirect(url) return HttpResponsePermanentRedirect(url)