[tor-commits] [bridgedb/master] PEP8 whitespace fixes in EmailServer.
isis at torproject.org
isis at torproject.org
Sat Apr 19 17:02:43 UTC 2014
commit 7cd85e71440a432a0a9963904f535944c57ebde0
Author: Isis Lovecruft <isis at torproject.org>
Date: Thu Apr 17 03:34:11 2014 +0000
PEP8 whitespace fixes in EmailServer.
---
lib/bridgedb/EmailServer.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py
index 65a3ccd..a645dbc 100644
--- a/lib/bridgedb/EmailServer.py
+++ b/lib/bridgedb/EmailServer.py
@@ -201,17 +201,14 @@ def getMailResponse(lines, ctx):
except Dist.TooSoonEmail as err:
logging.info("Got a mail too frequently; warning '%s': %s."
% (clientAddr, err))
-
# MAX_EMAIL_RATE is in seconds, convert to hours
body = buildSpamWarningTemplate(t) % (Dist.MAX_EMAIL_RATE / 3600)
return composeEmail(ctx.fromAddr, clientAddr, subject, body, msgID,
- gpgContext=ctx.gpgContext)
-
+ gpgContext=ctx.gpgContext)
except Dist.IgnoreEmail as err:
logging.info("Got a mail too frequently; ignoring '%s': %s."
% (clientAddr, err))
return None, None
-
except BadEmail as err:
logging.info("Got a mail from a bad email address '%s': %s."
% (clientAddr, err))
More information about the tor-commits
mailing list