Add isort to lint and autofix python import orders

Author: xylix

Browser/__init__.py

@@ -1,17 +1,18 @@
+from .browser import Browser
+from .entry import ensure_node_dependencies
 from .utils.data_types import (
-    TypedDict,
     AssertionOperator,
-    ElementState,
     ColorScheme,
-    ViewportDimensions,
-    SupportedBrowsers,
-    SelectAttribute,
+    ElementState,
     KeyboardModifier,
     MouseButton,
     RequestMethod,
+    SelectAttribute,
+    SupportedBrowsers,
+    TypedDict,
+    ViewportDimensions,
 )
 from .version import VERSION
-from .browser import Browser
 
 __version__ = VERSION
 __all__ = [
@@ -28,6 +29,5 @@
     "Browser",
 ]
 
-from .entry import ensure_node_dependencies
 
 ensure_node_dependencies()

Browser/assertion_engine.py

@@ -1,14 +1,5 @@
 import re
-from typing import (
-    Any,
-    cast,
-    Callable,
-    Dict,
-    List,
-    Optional,
-    Tuple,
-    TypeVar,
-)
+from typing import Any, Callable, Dict, List, Optional, Tuple, TypeVar, cast
 
 from robot.libraries.BuiltIn import BuiltIn  # type: ignore
 

Browser/browser.py

@@ -2,20 +2,20 @@
 import re
 from typing import List
 
-from robot.libraries.BuiltIn import BuiltIn, EXECUTION_CONTEXTS  # type: ignore
+from robot.libraries.BuiltIn import EXECUTION_CONTEXTS, BuiltIn  # type: ignore
 from robotlibcore import DynamicCore  # type: ignore
 
 from .keywords import (
     Control,
     Cookie,
+    Evaluation,
     Getters,
     Interaction,
+    Network,
     PlaywrightState,
     Promises,
     Waiter,
     WebAppState,
-    Evaluation,
-    Network,
 )
 from .playwright import Playwright
 from .utils import logger

Browser/dev-requirements.txt

@@ -5,6 +5,7 @@ mypy >= 0.782
 mypy-protobuf >= 1.23
 flake8 >= 3.8.3
 robotframework >= 3.2.1
+isort >= 5.2.2
 wheel>=0.34.2
 robotframework-pabot >= 1.8.1
 twine >= 3.2.0

Browser/entry.py

@@ -1,8 +1,8 @@
 import os
-from subprocess import Popen, PIPE, STDOUT, DEVNULL, CalledProcessError
 import subprocess
 import sys
 from pathlib import Path
+from subprocess import DEVNULL, PIPE, STDOUT, CalledProcessError, Popen
 
 from .utils import logger
 

Browser/gen_stub.py

@@ -1,7 +1,8 @@
-import Browser
 import inspect
 from typing import Any
 
+import Browser
+
 
 def is_named_method(keyword_name: str) -> bool:
     keyword_attribute = br.attributes[keyword_name]

Browser/keywords/__init__.py

@@ -1,10 +1,10 @@
 from .browser_control import Control
 from .cookie import Cookie
 from .evaluation import Evaluation
-from .playwright_state import PlaywrightState
 from .getters import Getters
 from .interaction import Interaction
 from .network import Network
+from .playwright_state import PlaywrightState
 from .promises import Promises
 from .waiter import Waiter
 from .webapp_state import WebAppState

Browser/keywords/browser_control.py

@@ -2,8 +2,8 @@
 
 from ..base import LibraryComponent
 from ..generated.playwright_pb2 import Request
-from ..utils.time_conversion import timestr_to_millisecs
 from ..utils import logger
+from ..utils.time_conversion import timestr_to_millisecs
 
 
 class Control(LibraryComponent):

Browser/keywords/cookie.py

@@ -1,5 +1,5 @@
 import json
-from typing import Optional, Any, Dict, List
+from typing import Any, Dict, List, Optional
 
 from robot.libraries.DateTime import convert_date  # type: ignore
 from robotlibcore import keyword  # type: ignore

Browser/keywords/evaluation.py

@@ -1,7 +1,7 @@
 import json
+from typing import Any
 
 from robotlibcore import keyword  # type: ignore
-from typing import Any
 
 from ..base import LibraryComponent
 from ..generated.playwright_pb2 import Request

Browser/keywords/getters.py

@@ -1,21 +1,15 @@
 import json
-from typing import (
-    Any,
-    Dict,
-    List,
-    Optional,
-    Union,
-)
+from typing import Any, Dict, List, Optional, Union
 
 from robotlibcore import keyword  # type: ignore
 
 from ..assertion_engine import (
     bool_verify_assertion,
-    verify_assertion,
-    list_verify_assertion,
     dict_verify_assertion,
     int_dict_verify_assertion,
     int_str_verify_assertion,
+    list_verify_assertion,
+    verify_assertion,
 )
 from ..base import LibraryComponent
 from ..generated.playwright_pb2 import Request

Browser/keywords/interaction.py

@@ -1,15 +1,12 @@
 import json
-from typing import (
-    Dict,
-    Optional,
-)
+from typing import Dict, Optional
 
 from robotlibcore import keyword  # type: ignore
 
 from ..base import LibraryComponent
 from ..generated.playwright_pb2 import Request
 from ..utils import logger
-from ..utils.data_types import MouseButton, KeyboardModifier, SelectAttribute
+from ..utils.data_types import KeyboardModifier, MouseButton, SelectAttribute
 from ..utils.time_conversion import timestr_to_millisecs
 
 

Browser/keywords/network.py

@@ -1,13 +1,13 @@
 import json
+from typing import Dict, Literal, Optional
 
 from robotlibcore import keyword  # type: ignore
-from typing import Optional, Dict, Literal
 
 from ..base import LibraryComponent
 from ..generated.playwright_pb2 import Request
 from ..utils import logger
-from ..utils.time_conversion import timestr_to_millisecs
 from ..utils.data_types import RequestMethod
+from ..utils.time_conversion import timestr_to_millisecs
 
 
 def _get_headers(body: str, headers: Dict):

Browser/keywords/playwright_state.py

@@ -1,16 +1,12 @@
 import json
-from typing import (
-    Dict,
-    List,
-    Optional,
-)
+from typing import Dict, List, Optional
 
 from robotlibcore import keyword  # type: ignore
 
 from ..base import LibraryComponent
 from ..generated.playwright_pb2 import Request
 from ..utils import logger
-from ..utils.data_types import SupportedBrowsers, ViewportDimensions, ColorScheme
+from ..utils.data_types import ColorScheme, SupportedBrowsers, ViewportDimensions
 from ..utils.meta_python import locals_to_params
 from ..utils.time_conversion import timestr_to_millisecs
 

Browser/keywords/promises.py

@@ -1,4 +1,4 @@
-from concurrent.futures import ThreadPoolExecutor, Future
+from concurrent.futures import Future, ThreadPoolExecutor
 from typing import Set
 
 from robot.api.deco import keyword  # type: ignore

Browser/keywords/webapp_state.py

@@ -1,8 +1,5 @@
 import json
-from typing import (
-    Any,
-    Optional,
-)
+from typing import Any, Optional
 
 from robotlibcore import keyword  # type: ignore
 

Browser/playwright.py

@@ -2,16 +2,16 @@
 import functools
 import os
 import socket
-from subprocess import Popen, STDOUT
 import time
+from subprocess import STDOUT, Popen
 
 import grpc  # type: ignore
-from robot.libraries.BuiltIn import BuiltIn, EXECUTION_CONTEXTS  # type: ignore
+from robot.libraries.BuiltIn import EXECUTION_CONTEXTS, BuiltIn  # type: ignore
 
-from Browser.generated.playwright_pb2 import Request
 import Browser.generated.playwright_pb2_grpc as playwright_pb2_grpc
-from Browser.utils.time_conversion import timestr_to_millisecs
+from Browser.generated.playwright_pb2 import Request
 from Browser.utils import logger
+from Browser.utils.time_conversion import timestr_to_millisecs
 
 
 class Playwright:

Browser/pyproject.toml

@@ -14,3 +14,8 @@ exclude = '''
   | __init__\.pyi
 )/
 '''
+
+[tool.isort]
+profile = "black"
+src_paths="."
+skip_glob = ["generated", "__init__.pyi"]

Makefile

@@ -59,6 +59,7 @@ lint-python:
 	black --config Browser/pyproject.toml Browser/
 	black --config Browser/pyproject.toml utest/
 	flake8 --config Browser/.flake8 Browser/ utest/
+	isort Browser/
 
 node/.linted: build node/playwright-wrapper/*.ts node/dynamic-test-app/src/*
 	yarn run lint