From e7809563b16f197659b6e77e66b6a55fe8a6a470 Mon Sep 17 00:00:00 2001 From: Jakub Warmuz Date: Thu, 15 Oct 2015 17:23:43 +0000 Subject: [PATCH] Address first batch of Seth's review comments. --- acme/acme/standalone.py | 7 ++++--- acme/acme/standalone_test.py | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/acme/acme/standalone.py b/acme/acme/standalone.py index 089c2ff18..97e52fa9f 100644 --- a/acme/acme/standalone.py +++ b/acme/acme/standalone.py @@ -46,7 +46,8 @@ class TLSServer(socketserver.TCPServer): class ACMEServerMixin: # pylint: disable=old-style-class """ACME server common settings mixin.""" - server_version = "ACME standalone client" + # TODO: c.f. #858 + server_version = "ACME client standalone challenge solver" allow_reuse_address = True def __init__(self): @@ -95,7 +96,7 @@ class SimpleHTTPServer(BaseHTTPServer.HTTPServer, ACMEServerMixin): class SimpleHTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler): """SimpleHTTP challenge handler. - Adheres to the stdlib"s `socketserver.BaseRequestHandler` interface. + Adheres to the stdlib's `socketserver.BaseRequestHandler` interface. :ivar set simple_http_resources: A set of `SimpleHTTPResource` objects. TODO: better name? @@ -119,7 +120,7 @@ class SimpleHTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler): def handle_index(self): """Handle index page.""" self.send_response(200) - self.send_header("Content-type", "text/html") + self.send_header("Content-Type", "text/html") self.end_headers() self.wfile.write(self.server.server_version.encode()) diff --git a/acme/acme/standalone_test.py b/acme/acme/standalone_test.py index 7eda2fce3..14d212d6e 100644 --- a/acme/acme/standalone_test.py +++ b/acme/acme/standalone_test.py @@ -122,7 +122,8 @@ class SimpleHTTPServerTest(unittest.TestCase): def test_index(self): response = requests.get( 'http://localhost:{0}'.format(self.port), verify=False) - self.assertEqual(response.text, 'ACME standalone client') + self.assertEqual( + response.text, 'ACME client standalone challenge solver') self.assertTrue(response.ok) def test_404(self):