Keep the typing import grouped

by moving them at the end. This way, the typing import are grouped
even when

    if TYPE_CHECKING:
        import …

is used

Signed-off-by: Gaëtan Lehmann <[email protected]>

Author: glehmann

conftest.py

@@ -1,5 +1,3 @@
-from typing import Dict
-
 import pytest
 
 import itertools
@@ -33,6 +31,8 @@
 # need to import them in the global conftest.py so that they are recognized as fixtures.
 from pkgfixtures import formatted_and_mounted_ext4_disk, sr_disk_wiped
 
+from typing import Dict
+
 # Do we cache VMs?
 try:
     from data import CACHE_IMPORTED_VM

lib/basevm.py

@@ -1,7 +1,7 @@
-from typing import TYPE_CHECKING, Any, Literal, Optional, overload
-
 import logging
 
+from typing import TYPE_CHECKING, Any, Literal, Optional, overload
+
 if TYPE_CHECKING:
     import lib.host
 

lib/commands.py

@@ -1,5 +1,3 @@
-from typing import List, Literal, Union, overload
-
 import base64
 import logging
 import shlex
@@ -8,6 +6,8 @@
 import lib.config as config
 from lib.netutil import wrap_ip
 
+from typing import List, Literal, Union, overload
+
 class BaseCommandFailed(Exception):
     __slots__ = 'returncode', 'stdout', 'cmd'
 

lib/common.py

@@ -1,5 +1,3 @@
-from typing import TYPE_CHECKING, Callable, Dict, Literal, Optional, TypeVar, Union, cast, overload
-
 import pytest
 
 import getpass
@@ -17,6 +15,8 @@
 
 import lib.commands as commands
 
+from typing import TYPE_CHECKING, Callable, Dict, Literal, Optional, TypeVar, Union, cast, overload
+
 if TYPE_CHECKING:
     import lib.host
 

lib/host.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Dict, List, Literal, Optional, Union, overload
-
 import logging
 import os
 import shlex
@@ -13,6 +11,8 @@
 import lib.commands as commands
 import lib.pif as pif
 
+from typing import TYPE_CHECKING, Dict, List, Literal, Optional, Union, overload
+
 if TYPE_CHECKING:
     import lib.pool
 

lib/pool.py

@@ -1,5 +1,3 @@
-from typing import Any, Dict, Optional
-
 import logging
 import os
 import traceback
@@ -11,6 +9,8 @@
 from lib.host import Host
 from lib.sr import SR
 
+from typing import Any, Dict, Optional
+
 class Pool:
     xe_prefix = "pool"
 

lib/typing.py

@@ -1,7 +1,7 @@
-from typing import TypedDict
-
 import sys
 
+from typing import TypedDict
+
 if sys.version_info >= (3, 11):
     from typing import NotRequired
 else:

lib/vdi.py

@@ -1,9 +1,9 @@
-from typing import TYPE_CHECKING, Literal, Optional, overload
-
 import logging
 
 from lib.common import _param_add, _param_clear, _param_get, _param_remove, _param_set, strtobool
 
+from typing import TYPE_CHECKING, Literal, Optional, overload
+
 if TYPE_CHECKING:
     from lib.host import Host
     from lib.sr import SR

lib/vm.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, List, Literal, Optional, Union, overload
-
 import logging
 import os
 import tempfile
@@ -23,6 +21,8 @@
 from lib.vbd import VBD
 from lib.vif import VIF
 
+from typing import TYPE_CHECKING, List, Literal, Optional, Union, overload
+
 if TYPE_CHECKING:
     from lib.host import Host
 

lib/xo.py

@@ -1,8 +1,8 @@
-from typing import Any, Dict, Literal, Union, overload
-
 import json
 import subprocess
 
+from typing import Any, Dict, Literal, Union, overload
+
 @overload
 def xo_cli(action: str, args: Dict[str, str] = {}, *, check: bool = True, simple_output: Literal[True] = True,
            use_json: Literal[False] = False) -> str: