update

httplib/httpsocket.py

@@ -26,42 +26,26 @@ class HTTPSocket:
         self.file = self.conn.makefile("rb")
 
     def close(self):
+        """
+        Close this socket
+        """
         self.file.close()
-        # self.conn.shutdown(socket.SHUT_RDWR)
         self.conn.close()
 
     def is_closed(self):
         return self.file is None
 
     def reset_request(self):
+        """
+        Close the file handle of this socket and create a new one.
+        """
         self.file.close()
         self.file = self.conn.makefile("rb")
 
-    def __do_receive(self):
-        if self.conn.fileno() == -1:
-            raise Exception("Connection closed")
-
-        result = self.conn.recv(BUFSIZE)
-        return result
-
-    def receive(self):
-        """Receive data from the client up to BUFSIZE
-        """
-        count = 0
-        while True:
-            count += 1
-            try:
-                return self.__do_receive()
-            except socket.timeout:
-                logging.debug("Socket receive timed out after %s seconds", TIMEOUT)
-                if count == 3:
-                    break
-                logging.debug("Retrying %s", count)
-
-        logging.debug("Timed out after waiting %s seconds for response", TIMEOUT * count)
-        raise TimeoutError("Request timed out")
-
     def read(self, size=BUFSIZE, blocking=True) -> bytes:
+        """
+        Read bytes up to the specified buffer size. This method will block when `blocking` is set to True (Default).
+        """
         if blocking:
             buffer = self.file.read(size)
         else:
@@ -72,14 +56,18 @@ class HTTPSocket:
         return buffer
 
     def read_line(self):
-        try:
-            line = str(self.read_bytes_line(), FORMAT)
-        except UnicodeDecodeError:
-            # Expected UTF-8
-            raise BadRequest()
-        return line
+        """
+        Read a line decoded as `httpsocket.FORMAT`.
+        @return: the decoded line
+        @raise: UnicodeDecodeError
+        """
+        return str(self.read_bytes_line(), FORMAT)
 
     def read_bytes_line(self) -> bytes:
+        """
+        Read a line as bytes.
+        """
+
         line = self.file.readline(MAXLINE + 1)
         if len(line) > MAXLINE:
             raise InvalidResponse("Line too long")