isort everything except lib (for now) (#952)

* isort the tests folder

* Carry over changes from #672

* Disable pre-commit

* Revert flake8 config change

* isort examples too

Author: abhinavsingh

.isort.cfg

@@ -0,0 +1,24 @@
+# https://github.com/timothycrosley/isort/wiki/isort-Settings
+[settings]
+default_section = THIRDPARTY
+# force_to_top=file1.py,file2.py
+# forced_separate = django.contrib,django.utils
+include_trailing_comma = true
+indent = 4
+known_first_party = proxy
+# known_future_library = future,pies
+# known_standard_library = std,std2
+known_testing = pytest,unittest
+length_sort = 1
+# Should be: 80 - 1
+line_length = 79
+lines_after_imports = 2
+# https://pycqa.github.io/isort/docs/configuration/multi_line_output_modes.html
+# NOTE: Another mode could be "5" for grouping multiple "import from" under
+# NOTE: a single instruction.
+multi_line_output = 5
+no_lines_before = LOCALFOLDER
+sections=FUTURE,STDLIB,TESTING,THIRDPARTY,FIRSTPARTY,LOCALFOLDER
+# skip=file3.py,file4.py
+use_parentheses = true
+verbose = true

.pre-commit-config.yaml

@@ -8,7 +8,7 @@ repos:
     - --py36-plus
 
 # - repo: https://github.com/timothycrosley/isort.git
-#   rev: 5.4.2
+#   rev: 5.10.0
 #   hooks:
 #   - id: isort
 #     args:

check.py

@@ -10,10 +10,11 @@
 """
 import sys
 import subprocess
-
 from pathlib import Path
+
 from proxy.common.version import __version__ as lib_version
 
+
 # This script ensures our versions never run out of sync.
 #
 # 1. TODO: Version is hardcoded in homebrew stable package

examples/https_connect_tunnel.py

@@ -9,18 +9,14 @@
     :license: BSD, see LICENSE for more details.
 """
 import time
-
 from typing import Any, Optional
 
 from proxy import Proxy
-
+from proxy.core.base import BaseTcpTunnelHandler
 from proxy.http.responses import (
-    PROXY_TUNNEL_ESTABLISHED_RESPONSE_PKT,
-    PROXY_TUNNEL_UNSUPPORTED_SCHEME,
+    PROXY_TUNNEL_UNSUPPORTED_SCHEME, PROXY_TUNNEL_ESTABLISHED_RESPONSE_PKT,
 )
 
-from proxy.core.base import BaseTcpTunnelHandler
-
 
 class HttpsConnectTunnelHandler(BaseTcpTunnelHandler):
     """A https CONNECT tunnel."""

examples/pubsub_eventing.py

@@ -9,13 +9,15 @@
     :license: BSD, see LICENSE for more details.
 """
 import time
-import multiprocessing
 import logging
+import multiprocessing
+from typing import Any, Dict, Optional
 
-from typing import Dict, Any, Optional
-
+from proxy.core.event import (
+    EventQueue, EventManager, EventSubscriber, eventNames,
+)
 from proxy.common.constants import DEFAULT_LOG_FORMAT
-from proxy.core.event import EventManager, EventQueue, EventSubscriber, eventNames
+
 
 logging.basicConfig(level=logging.DEBUG, format=DEFAULT_LOG_FORMAT)
 

examples/ssl_echo_client.py

@@ -13,6 +13,7 @@
 from proxy.core.connection import TcpServerConnection
 from proxy.common.constants import DEFAULT_BUFFER_SIZE
 
+
 logger = logging.getLogger(__name__)
 
 if __name__ == '__main__':

examples/ssl_echo_server.py

@@ -12,11 +12,10 @@
 from typing import Optional
 
 from proxy import Proxy
+from proxy.core.base import BaseTcpServerHandler
 from proxy.common.utils import wrap_socket
 from proxy.core.connection import TcpClientConnection
 
-from proxy.core.base import BaseTcpServerHandler
-
 
 class EchoSSLServerHandler(BaseTcpServerHandler):
     """Wraps client socket during initialization."""

examples/tcp_echo_client.py

@@ -13,6 +13,7 @@
 from proxy.common.utils import socket_connection
 from proxy.common.constants import DEFAULT_BUFFER_SIZE
 
+
 logger = logging.getLogger(__name__)
 
 if __name__ == '__main__':

examples/web_scraper.py

@@ -11,9 +11,9 @@
 import time
 
 from proxy import Proxy
+from proxy.common.types import Readables, Writables, SelectableEvents
 from proxy.core.acceptor import Work
 from proxy.core.connection import TcpClientConnection
-from proxy.common.types import Readables, SelectableEvents, Writables
 
 
 class WebScraper(Work[TcpClientConnection]):

examples/websocket_client.py

@@ -11,7 +11,10 @@
 import time
 import logging
 
-from proxy.http.websocket import WebsocketClient, WebsocketFrame, websocketOpcodes
+from proxy.http.websocket import (
+    WebsocketFrame, WebsocketClient, websocketOpcodes,
+)
+
 
 # globals
 client: WebsocketClient