commit 7a439e59c712c0dd1b425044a7493315c0a53476 Author: Isis Lovecruft isis@torproject.org Date: Tue Mar 4 04:38:08 2014 +0000
Remove unused HTTPServer.WebResourceBridges.domains attribute.
This was left over from commit 120c8e6d4b9d714e79722d83c19e110120977e79, wherein the HTTPS and email distributors were split into different files. The domains are taken from config.EMAIL_DOMAINS and are only applicable to the email server. --- lib/bridgedb/HTTPServer.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 724e8cd..b679ff5 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -249,7 +249,7 @@ class WebResourceBridges(twisted.web.resource.Resource): isLeaf = True
def __init__(self, distributor, schedule, N=1, useForwardedHeader=False, - includeFingerprints=True, domains=None): + includeFingerprints=True): """Create a new WebResource.
:type distributor: :class:`IPBasedDistributor` @@ -273,10 +273,6 @@ class WebResourceBridges(twisted.web.resource.Resource): self.useForwardedHeader = useForwardedHeader self.includeFingerprints = includeFingerprints
- # do not use mutable types as __init__ defaults! - if not domains: domains = [] - self.domains = domains - def render(self, request): """Render a response for a client HTTP request.
@@ -481,8 +477,7 @@ def addWebServer(cfg, dist, sched):
resource = WebResourceBridges(dist, sched, cfg.HTTPS_N_BRIDGES_PER_ANSWER, cfg.HTTP_USE_IP_FROM_FORWARDED_HEADER, - includeFingerprints=cfg.HTTPS_INCLUDE_FINGERPRINTS, - domains=cfg.EMAIL_DOMAINS) + includeFingerprints=cfg.HTTPS_INCLUDE_FINGERPRINTS)
resource_options = WebResourceOptions()