commit 24d53464c031b2c70758b1655caf4a305c29dede Author: Isis Lovecruft isis@torproject.org Date: Mon Apr 7 03:06:30 2014 +0000

PEP8 reorder import statements in HTTPServer. --- lib/bridgedb/HTTPServer.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index c0e5b66..40a69af 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -14,6 +14,13 @@ import textwrap import time import os

+from ipaddr import IPv4Address +from ipaddr import IPv6Address + +import mako.exceptions +from mako.template import Template +from mako.lookup import TemplateLookup + from twisted.internet import reactor from twisted.internet.error import CannotListenError from twisted.python import filepath @@ -35,11 +42,7 @@ from bridgedb.Filters import filterBridgesByTransport from bridgedb.Filters import filterBridgesByNotBlockedIn from bridgedb.parse import headers

-from ipaddr import IPv4Address, IPv6Address from random import randint -import mako.exceptions -from mako.template import Template -from mako.lookup import TemplateLookup

template_root = os.path.join(os.path.dirname(__file__),'templates')