Add suggestions coming from #659

Author: abhinavsingh

.flake8

@@ -148,7 +148,6 @@ extend-ignore =
   WPS420  # FIXME: pointless keyword like `pass`
   WPS421  # FIXME: call to `print()`
   WPS425  # FIXME: bool non-keyword arg
-  WPS427  # FIXME: unreachable code
   WPS428  # FIXME: pointless statement
   WPS430  # FIXME: nested func
   WPS431  # FIXME: nested class

.pylintrc

@@ -127,7 +127,6 @@ disable=raw-checker-failed,
         too-many-return-statements,
         too-many-statements,
         unnecessary-pass,
-        unreachable,
         unused-argument,
         useless-return,
         useless-super-delegation,

proxy/common/types.py

@@ -22,6 +22,7 @@
 else:
     from typing_extensions import Protocol
 
+
 if TYPE_CHECKING:
     DictQueueType = queue.Queue[Dict[str, Any]]    # pragma: no cover
 else:

proxy/core/event/dispatcher.py

@@ -83,11 +83,7 @@ def run(self) -> None:
                     self.run_once()
                 except queue.Empty:
                     pass
-        except BrokenPipeError:
-            pass
-        except EOFError:
-            pass
-        except KeyboardInterrupt:
+        except (BrokenPipeError, EOFError, KeyboardInterrupt):
             pass
         except Exception as e:
             logger.exception('Dispatcher exception', exc_info=e)

proxy/core/event/subscriber.py

@@ -103,9 +103,7 @@ def unsubscribe(self) -> None:
             return
         try:
             self.event_queue.unsubscribe(self.relay_sub_id)
-        except BrokenPipeError:
-            pass
-        except EOFError:
+        except (BrokenPipeError, EOFError):
             pass
         finally:
             # self.relay_sub_id = None

proxy/plugin/filter_by_url_regex.py

@@ -72,8 +72,7 @@ def handle_client_request(
             request.path,
         )
         # check URL against list
-        rule_number = 1
-        for blocked_entry in self.filters:
+        for rule_number, blocked_entry in enumerate(self.filters, start=1):
             # if regex matches on URL
             if re.search(text_(blocked_entry['regex']), text_(url)):
                 # log that the request has been filtered
@@ -90,8 +89,4 @@ def handle_client_request(
                     status_code=httpStatusCodes.NOT_FOUND,
                     reason=b'Blocked',
                 )
-                # stop looping through filter list
-                break
-            # increment rule number
-            rule_number += 1
         return request