client: cleanup

client/httpclient.py

@@ -1,8 +1,6 @@
 import logging
-import re
 import socket
 from io import BufferedReader
-from typing import TextIO, IO
 
 BUFSIZE = 4096
 TIMEOUT = 3
@@ -31,7 +29,7 @@ class HTTPClient(socket.socket):
         self.file.close()
         self.file = self.makefile("rb")
 
-    def _do_receive(self):
+    def __do_receive(self):
         if self.fileno() == -1:
             raise Exception("Connection closed")
 
@@ -45,7 +43,7 @@ class HTTPClient(socket.socket):
         while True:
             count += 1
             try:
-                return self._do_receive()
+                return self.__do_receive()
             except socket.timeout:
                 logging.debug("Socket receive timed out after %s seconds", TIMEOUT)
                 if count == 3:
@@ -75,69 +73,6 @@ class HTTPClient(socket.socket):
 
         return line
 
-    def validate_status_line(self, status_line: str):
-        split = list(filter(None, status_line.split(" ")))
-        if len(split) < 3:
-            return False
-
-        # Check HTTP version
-        http_version = split.pop(0)
-        if len(http_version) < 8 or http_version[4] != "/":
-            raise InvalidStatusLine(status_line)
-        (name, version) = http_version[:4], http_version[5:]
-        if name != "HTTP" or not re.match(r"1\.[0|1]", version):
-            return False
-
-        if not re.match(r"\d{3}", split[0]):
-            return False
-
-        return True
-
-    def get_crlf_chunk(self, buffer: bytes):
-        """Finds the line break type (`CRLF` or `LF`) and splits the specified buffer
-        when encountering 2 consecutive linebreaks.
-        Returns a tuple with the first part and the remaining of the buffer.
-
-        :param buffer:
-        :return:
-        """
-        lf_pos = buffer.find(b"\n\n")
-        crlf_pos = buffer.find(b"\r\n\r\n")
-        if lf_pos != -1 and lf_pos < crlf_pos:
-            split_start = lf_pos
-            split_end = lf_pos + 2
-        else:
-            split_start = crlf_pos
-            split_end = crlf_pos + 4
-
-        return buffer[:split_start], buffer[split_end:]
-
-    def parse_headers(self, data: bytes):
-        headers = {}
-
-        # decode bytes, split into lines and filter
-        header_split = list(
-            filter(lambda l: l is not "" and not l[0].isspace(), map(str.strip, data.decode("utf-8").split("\n"))))
-
-        if len(header_split) == 0:
-            raise InvalidResponse(data)
-
-        start_line = header_split.pop(0)
-        logging.debug("start-line: %r", start_line)
-
-        for line in header_split:
-            pos = line.find(":")
-
-            if pos <= 0 or pos >= len(line) - 1:
-                continue
-
-            (header, value) = map(str.strip, line.split(":", 1))
-            headers[header.lower()] = value.lower()
-
-        logging.debug("Parsed headers: %r", headers)
-
-        return start_line, headers
-
 
 class HTTPException(Exception):
     """ Base class for HTTP exceptions """
@@ -164,6 +99,7 @@ class UnsupportedEncoding(HTTPException):
         self.enc_type = enc_type
         self.encoding = encoding
 
+
 class IncompleteResponse(HTTPException):
     def __init(self, cause):
-        self.cause = cause
+        self.cause = cause