[tor-commits] [bridgedb/master] Several whitespace fixes in bridgedb.HTTPServer module.
isis at torproject.org
isis at torproject.org
Sun Jan 12 06:06:36 UTC 2014
commit 38af253fba219deccf3b7478fede61689171590d
Author: Isis Lovecruft <isis at torproject.org>
Date: Sun Jan 12 04:53:03 2014 +0000
Several whitespace fixes in bridgedb.HTTPServer module.
---
lib/bridgedb/HTTPServer.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py
index 51387b0..be5bc44 100644
--- a/lib/bridgedb/HTTPServer.py
+++ b/lib/bridgedb/HTTPServer.py
@@ -26,7 +26,7 @@ import bridgedb.Dist
import bridgedb.I18n as I18n
import bridgedb.Util as Util
-from recaptcha.client import captcha
+from recaptcha.client import captcha
from bridgedb.Raptcha import Raptcha
from bridgedb.Filters import filterBridgesByIP6, filterBridgesByIP4
from bridgedb.Filters import filterBridgesByTransport
@@ -60,7 +60,7 @@ try:
except Exception as err:
logging.debug("Error while loading geoip module: %r" % err)
- logging.warn("GeoIP database not found")
+ logging.warn("GeoIP database not found")
geoip = None
else:
logging.info("GeoIP database loaded")
@@ -129,7 +129,7 @@ class WebResource(twisted.web.resource.Resource):
isLeaf = True
def __init__(self, distributor, schedule, N=1, useForwardedHeader=False,
- includeFingerprints=True, domains=None):
+ includeFingerprints=True, domains=None):
"""Create a new WebResource.
distributor -- an IPBasedDistributor object
schedule -- an IntervalSchedule object
@@ -309,7 +309,7 @@ def addWebServer(cfg, dist, sched):
HTTPS_USE_IP_FROM_FORWARDED_HEADER
RECAPTCHA_ENABLED
RECAPTCHA_PUB_KEY
- RECAPTCHA_PRIV_KEY
+ RECAPTCHA_PRIV_KEY
dist -- an IPBasedDistributor object.
sched -- an IntervalSchedule object.
"""
@@ -335,7 +335,7 @@ def addWebServer(cfg, dist, sched):
httpdist.putChild('bridges', protected)
else:
httpdist.putChild('bridges', resource)
-
+
site = Site(httpdist)
if cfg.HTTP_UNENCRYPTED_PORT:
More information about the tor-commits
mailing list