[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r12861: Identify the bridges in HTML by an id tag, and in email by i (in bridgedb/trunk: . lib/bridgedb)
Author: nickm
Date: 2007-12-18 18:04:47 -0500 (Tue, 18 Dec 2007)
New Revision: 12861
Modified:
bridgedb/trunk/
bridgedb/trunk/lib/bridgedb/Server.py
Log:
r17240@catbus: nickm | 2007-12-18 16:58:29 -0500
Identify the bridges in HTML by an id tag, and in email by indenting them.
Property changes on: bridgedb/trunk
___________________________________________________________________
svk:merge ticket from /bridgedb/trunk [r17240] on 8246c3cf-6607-4228-993b-4d95d33730f1
Modified: bridgedb/trunk/lib/bridgedb/Server.py
===================================================================
--- bridgedb/trunk/lib/bridgedb/Server.py 2007-12-18 22:39:15 UTC (rev 12860)
+++ bridgedb/trunk/lib/bridgedb/Server.py 2007-12-18 23:04:47 UTC (rev 12861)
@@ -21,7 +21,9 @@
HTML_MESSAGE_TEMPLATE = """
<html><body>
<p>Here are your bridge relays:
-<pre>%s</pre>
+<pre id="bridges">
+%s
+</pre>
</p>
<p>Bridge relays (or "bridges" for short) are Tor relays that aren't listed
in the main directory. Since there is no complete public list of them,
@@ -162,7 +164,7 @@
w.addheader("Date", twisted.mail.smtp.rfc822date())
body = w.startbody("text/plain")
- answer = "".join("%s\n" % b.getConfigLine() for b in bridges)
+ answer = "".join(" %s\n" % b.getConfigLine() for b in bridges)
body.write(EMAIL_MESSAGE_TEMPLATE % answer)
f.seek(0)