From f4322a1e24cff4624e5ff7c922c1d4062e7a9d95 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Fri, 12 Dec 2008 16:50:27 +0000
Subject: [PATCH] ganeti.http: Rename HttpSocketBase to HttpBase
It's more appropriate.
Reviewed-by: iustinp
---
lib/http/__init__.py | 2 +-
lib/http/client.py | 4 ++--
lib/http/server.py | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/http/__init__.py b/lib/http/__init__.py
index 2a9a843bf..550bcc14f 100644
--- a/lib/http/__init__.py
+++ b/lib/http/__init__.py
@@ -369,7 +369,7 @@ class HttpSslParams(object):
self.ssl_cert_pem)
-class HttpSocketBase(object):
+class HttpBase(object):
"""Base class for HTTP server and client.
"""
diff --git a/lib/http/client.py b/lib/http/client.py
index 50c91722e..72836f1d2 100644
--- a/lib/http/client.py
+++ b/lib/http/client.py
@@ -141,7 +141,7 @@ class _HttpServerToClientMessageReader(http.HttpMessageReader):
return http.HttpServerToClientStartLine(version, status, reason)
-class HttpClientRequestExecutor(http.HttpSocketBase):
+class HttpClientRequestExecutor(http.HttpBase):
# Default headers
DEFAULT_HEADERS = {
http.HTTP_USER_AGENT: http.HTTP_GANETI_VERSION,
@@ -164,7 +164,7 @@ class HttpClientRequestExecutor(http.HttpSocketBase):
@param req: Request object
"""
- http.HttpSocketBase.__init__(self)
+ http.HttpBase.__init__(self)
self.request = req
self.poller = select.poll()
diff --git a/lib/http/server.py b/lib/http/server.py
index f94baaefa..128d2051c 100644
--- a/lib/http/server.py
+++ b/lib/http/server.py
@@ -379,7 +379,7 @@ class _HttpServerRequestExecutor(object):
self.response_msg.body = self.error_message_format % values
-class HttpServer(http.HttpSocketBase):
+class HttpServer(http.HttpBase):
"""Generic HTTP server class
Users of this class must subclass it and override the HandleRequest function.
@@ -404,7 +404,7 @@ class HttpServer(http.HttpSocketBase):
it with our certificate
"""
- http.HttpSocketBase.__init__(self)
+ http.HttpBase.__init__(self)
self.mainloop = mainloop
self.local_address = local_address
--
GitLab