summaryrefslogtreecommitdiff
path: root/Mailman/HTMLFormatter.py
diff options
context:
space:
mode:
authorcotton1998-11-09 16:32:05 +0000
committercotton1998-11-09 16:32:05 +0000
commitcc723a8b63ed04e98992db0bd4df4fc9a2769c7e (patch)
tree4dcbc59e69b1bc883aeba54c50e7c7d91fc81c8c /Mailman/HTMLFormatter.py
parenta4ba2dd36f905a72a92fd67cf24e3e116bb8139f (diff)
downloadmailman-cc723a8b63ed04e98992db0bd4df4fc9a2769c7e.tar.gz
mailman-cc723a8b63ed04e98992db0bd4df4fc9a2769c7e.tar.zst
mailman-cc723a8b63ed04e98992db0bd4df4fc9a2769c7e.zip
os.path.join -> %s/%s for urls.
bug reported by greg stein scott
Diffstat (limited to 'Mailman/HTMLFormatter.py')
-rw-r--r--Mailman/HTMLFormatter.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/Mailman/HTMLFormatter.py b/Mailman/HTMLFormatter.py
index d81cc68dc..be95b4fe3 100644
--- a/Mailman/HTMLFormatter.py
+++ b/Mailman/HTMLFormatter.py
@@ -93,8 +93,9 @@ class HTMLFormatter:
showing = ObscureEmail(person, for_text=1)
else:
showing = person
- got = Link(os.path.join(me.GetRelativeScriptURL('options'),
- id), showing)
+ url = "%s/%s" % (me.GetRelativeScriptURL('options'),
+ id)
+ got = Link(url, showing)
if me.GetUserOption(person, disdel):
got = Italic("(", got, ")")
return got
@@ -292,7 +293,10 @@ class HTMLFormatter:
def FormatFormStart(self, name, extra=''):
base_url = self.GetRelativeScriptURL(name)
- full_url = os.path.join(base_url, extra)
+ if extra:
+ full_url = "%s/%s" % (base_url, extra)
+ else:
+ full_url = base_url
return ('<FORM Method=POST ACTION="%s">' % full_url)
def FormatArchiveAnchor(self):