From 48c4f207a8c633b94b12305a5d1e60f83c6e3069 Mon Sep 17 00:00:00 2001
From: Arthur Bols <arthur@bols.dev>
Date: Sun, 28 Mar 2021 01:59:08 +0100
Subject: [PATCH] Rename Server- and ClientMessage

Renamed ServerMessage and ClientMessage to respectively ResponseMessage
and RequestMessage to make it more clear.
---
 client/command.py          | 2 +-
 client/response_handler.py | 2 +-
 httplib/message.py         | 4 ++--
 server/command.py          | 2 +-
 server/requesthandler.py   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/command.py b/client/command.py
index 14fe48c..3df33e8 100644
--- a/client/command.py
+++ b/client/command.py
@@ -7,7 +7,7 @@ from client.httpclient import HTTPClient
 from httplib import parser
 from httplib.exceptions import InvalidResponse, InvalidStatusLine, UnsupportedEncoding
 from httplib.httpsocket import FORMAT
-from httplib.message import ClientMessage as Message
+from httplib.message import ResponseMessage as Message
 from httplib.retriever import PreambleRetriever
 
 sockets: Dict[str, HTTPClient] = {}
diff --git a/client/response_handler.py b/client/response_handler.py
index d946848..4bd8ddc 100644
--- a/client/response_handler.py
+++ b/client/response_handler.py
@@ -9,7 +9,7 @@ from client.httpclient import HTTPClient
 from httplib import parser
 from httplib.exceptions import InvalidResponse
 from httplib.httpsocket import FORMAT
-from httplib.message import ClientMessage as Message
+from httplib.message import ResponseMessage as Message
 from httplib.retriever import Retriever
 
 BASE_REGEX = re.compile(r"<\s*base[^>]*\shref\s*=\s*['\"]([^\"']+)['\"][^>]*>", re.M | re.I)
diff --git a/httplib/message.py b/httplib/message.py
index d21c5d6..3f78f14 100644
--- a/httplib/message.py
+++ b/httplib/message.py
@@ -16,7 +16,7 @@ class Message(ABC):
         self.body = body
 
 
-class ClientMessage(Message):
+class ResponseMessage(Message):
     status: int
     msg: str
 
@@ -26,7 +26,7 @@ class ClientMessage(Message):
         self.msg = msg
 
 
-class ServerMessage(Message):
+class RequestMessage(Message):
     method: str
     target: SplitResult
 
diff --git a/server/command.py b/server/command.py
index 83c8cf8..e51720d 100644
--- a/server/command.py
+++ b/server/command.py
@@ -9,7 +9,7 @@ from wsgiref.handlers import format_date_time
 from httplib import parser
 from httplib.exceptions import NotFound, Forbidden, NotModified
 from httplib.httpsocket import FORMAT
-from httplib.message import ServerMessage as Message
+from httplib.message import RequestMessage as Message
 
 CONTENT_ROOT = os.path.join(os.path.dirname(sys.argv[0]), "public")
 
diff --git a/server/requesthandler.py b/server/requesthandler.py
index b8805fd..74c07f4 100644
--- a/server/requesthandler.py
+++ b/server/requesthandler.py
@@ -12,7 +12,7 @@ from httplib import parser
 from httplib.exceptions import MethodNotAllowed, BadRequest, UnsupportedEncoding, NotImplemented, NotFound, \
     HTTPVersionNotSupported
 from httplib.httpsocket import HTTPSocket, FORMAT
-from httplib.message import ServerMessage as Message
+from httplib.message import RequestMessage as Message
 from httplib.retriever import Retriever, PreambleRetriever
 from server import command
 from server.serversocket import ServerSocket