chore: Refactor code quality issues

.deepsource.toml

@@ -0,0 +1,29 @@
+version = 1
+
+test_patterns = [
+    "tests/**",
+    "**/test_*.py"
+]
+
+exclude_patterns = [
+    "helper/**",
+    "menubar/**"
+]
+
+[[analyzers]]
+name = "python"
+enabled = true
+
+  [analyzers.meta]
+  runtime_version = "3.x.x"
+
+[[analyzers]]
+name = "javascript"
+enabled = true
+
+  [analyzers.meta]
+  environment = [
+    "nodejs",
+    "browser"
+  ]
+  dialect = "typescript"

proxy/core/acceptor/threadless.py

@@ -79,7 +79,7 @@ def selected_events(self) -> Generator[Tuple[Readables, Writables],
             if mask & selectors.EVENT_WRITE:
                 writables.append(key.fileobj)
         yield (readables, writables)
-        for fd in events.keys():
+        for fd in events:
             self.selector.unregister(fd)
 
     async def handle_events(

proxy/http/chunk_parser.py

@@ -33,7 +33,7 @@ def __init__(self) -> None:
         self.size: Optional[int] = None
 
     def parse(self, raw: bytes) -> bytes:
-        more = True if len(raw) > 0 else False
+        more = len(raw) > 0
         while more and self.state != chunkParserStates.COMPLETE:
             more, raw = self.process(raw)
         return raw

proxy/http/handler.py

@@ -330,7 +330,7 @@ def selected_events(self) -> \
             if mask & selectors.EVENT_WRITE:
                 writables.append(key.fileobj)
         yield (readables, writables)
-        for fd in events.keys():
+        for fd in events:
             self.selector.unregister(fd)
 
     def run_once(self) -> bool:

proxy/http/parser.py

@@ -51,7 +51,7 @@ def __init__(self, parser_type: int) -> None:
         # Buffer to hold unprocessed bytes
         self.buffer: bytes = b''
 
-        self.headers: Dict[bytes, Tuple[bytes, bytes]] = dict()
+        self.headers: Dict[bytes, Tuple[bytes, bytes]] = {}
         self.body: Optional[bytes] = None
 
         self.method: Optional[bytes] = None
@@ -146,7 +146,7 @@ def parse(self, raw: bytes) -> None:
         raw = self.buffer + raw
         self.buffer = b''
 
-        more = True if len(raw) > 0 else False
+        more = len(raw) > 0
         while more and self.state != httpParserStates.COMPLETE:
             if self.state in (
                     httpParserStates.HEADERS_COMPLETE,
@@ -265,7 +265,7 @@ def build_response(self) -> bytes:
 
     def has_upstream_server(self) -> bool:
         """Host field SHOULD be None for incoming local WebServer requests."""
-        return True if self.host is not None else False
+        return self.host is not None
 
     def is_http_1_1_keep_alive(self) -> bool:
         return self.version == HTTP_1_1 and \

proxy/http/proxy/server.py

@@ -185,8 +185,7 @@ def read_from_descriptors(self, r: Readables) -> bool:
                         '%s:%d timed out on recv' %
                         self.server.addr)
                     return True
-                else:
-                    raise e
+                raise e
             except ssl.SSLWantReadError:    # Try again later
                 # logger.warning('SSLWantReadError encountered while reading from server, will retry ...')
                 return False
@@ -196,7 +195,7 @@ def read_from_descriptors(self, r: Readables) -> bool:
                         '%s:%d unreachable on recv' %
                         self.server.addr)
                     return True
-                elif e.errno == errno.ECONNRESET:
+                if e.errno == errno.ECONNRESET:
                     logger.warning('Connection reset by upstream: %r' % e)
                 else:
                     logger.exception(
@@ -315,8 +314,7 @@ def on_client_data(self, raw: memoryview) -> Optional[memoryview]:
             else:
                 self.server.queue(raw)
             return None
-        else:
-            return raw
+        return raw
 
     def on_request_complete(self) -> Union[socket.socket, bool]:
         if not self.request.has_upstream_server():

proxy/http/server/web.py

@@ -207,7 +207,7 @@ def on_client_data(self, raw: memoryview) -> Optional[memoryview]:
             return None
         # If 1st valid request was completed and it's a HTTP/1.1 keep-alive
         # And only if we have a route, parse pipeline requests
-        elif self.request.state == httpParserStates.COMPLETE and \
+        if self.request.state == httpParserStates.COMPLETE and \
                 self.request.is_http_1_1_keep_alive() and \
                 self.route is not None:
             if self.pipeline_request is None:

tests/http/test_http_parser.py

@@ -187,7 +187,7 @@ def test_get_partial_parse1(self) -> None:
         self.parser.parse(host_hdr)
         self.assertEqual(self.parser.total_size,
                          len(pkt) + len(CRLF) + len(host_hdr))
-        self.assertDictEqual(self.parser.headers, dict())
+        self.assertDictEqual(self.parser.headers, {})
         self.assertEqual(self.parser.buffer, b'Host: localhost:8080')
         self.assertEqual(self.parser.state, httpParserStates.LINE_RCVD)