commit 1234ed25027bff7936b5bc32d32233970ed2813e Author: Isis Lovecruft isis@torproject.org Date: Tue Mar 25 22:21:11 2014 +0000

More import cleanups for HTTPServer.

* CHANGE `from twisted.web.server import Site` to import the entire `server` module instead. --- lib/bridgedb/HTTPServer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index c55e668..7e7df98 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -16,9 +16,9 @@ import os

from twisted.internet import reactor from twisted.internet.error import CannotListenError -from twisted.web.server import Site from twisted.python import filepath from twisted.web import resource +from twisted.web import server from twisted.web import static from twisted.web.util import redirectTo

@@ -789,7 +789,7 @@ def addWebServer(cfg, dist, sched): else: httpdist.putChild('bridges', bridgesResource)

- site = Site(httpdist) + site = server.Site(httpdist)

if cfg.HTTP_UNENCRYPTED_PORT: ip = cfg.HTTP_UNENCRYPTED_BIND_IP or ""