Commit f4322a1e authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

ganeti.http: Rename HttpSocketBase to HttpBase

It's more appropriate.

Reviewed-by: iustinp
parent c41eea6e
...@@ -369,7 +369,7 @@ class HttpSslParams(object): ...@@ -369,7 +369,7 @@ class HttpSslParams(object):
self.ssl_cert_pem) self.ssl_cert_pem)
class HttpSocketBase(object): class HttpBase(object):
"""Base class for HTTP server and client. """Base class for HTTP server and client.
""" """
......
...@@ -141,7 +141,7 @@ class _HttpServerToClientMessageReader(http.HttpMessageReader): ...@@ -141,7 +141,7 @@ class _HttpServerToClientMessageReader(http.HttpMessageReader):
return http.HttpServerToClientStartLine(version, status, reason) return http.HttpServerToClientStartLine(version, status, reason)
class HttpClientRequestExecutor(http.HttpSocketBase): class HttpClientRequestExecutor(http.HttpBase):
# Default headers # Default headers
DEFAULT_HEADERS = { DEFAULT_HEADERS = {
http.HTTP_USER_AGENT: http.HTTP_GANETI_VERSION, http.HTTP_USER_AGENT: http.HTTP_GANETI_VERSION,
...@@ -164,7 +164,7 @@ class HttpClientRequestExecutor(http.HttpSocketBase): ...@@ -164,7 +164,7 @@ class HttpClientRequestExecutor(http.HttpSocketBase):
@param req: Request object @param req: Request object
""" """
http.HttpSocketBase.__init__(self) http.HttpBase.__init__(self)
self.request = req self.request = req
self.poller = select.poll() self.poller = select.poll()
......
...@@ -379,7 +379,7 @@ class _HttpServerRequestExecutor(object): ...@@ -379,7 +379,7 @@ class _HttpServerRequestExecutor(object):
self.response_msg.body = self.error_message_format % values self.response_msg.body = self.error_message_format % values
class HttpServer(http.HttpSocketBase): class HttpServer(http.HttpBase):
"""Generic HTTP server class """Generic HTTP server class
Users of this class must subclass it and override the HandleRequest function. Users of this class must subclass it and override the HandleRequest function.
...@@ -404,7 +404,7 @@ class HttpServer(http.HttpSocketBase): ...@@ -404,7 +404,7 @@ class HttpServer(http.HttpSocketBase):
it with our certificate it with our certificate
""" """
http.HttpSocketBase.__init__(self) http.HttpBase.__init__(self)
self.mainloop = mainloop self.mainloop = mainloop
self.local_address = local_address self.local_address = local_address
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment