From 98e470b3a8a60a597e7c4ddb3695e550c765ccb2 Mon Sep 17 00:00:00 2001 From: Dan Fandrich Date: Fri, 3 Apr 2026 11:52:44 -0700 Subject: [PATCH] tests: alphabetize and group Python imports & add check - De-duplicates, groups, and sorts imports based on the provided `isort` settings. --- scripts/pythonlint.sh | 2 +- tests/dictserver.py | 3 +-- tests/http/conftest.py | 5 ++--- tests/http/scorecard.py | 13 +++++++++++-- tests/http/test_01_basic.py | 6 ++---- tests/http/test_02_download.py | 5 ++--- tests/http/test_03_goaway.py | 5 ++--- tests/http/test_04_stuttered.py | 7 +++---- tests/http/test_05_errors.py | 5 ++--- tests/http/test_06_eyeballs.py | 5 ++--- tests/http/test_07_upload.py | 5 ++--- tests/http/test_08_caddy.py | 5 ++--- tests/http/test_09_push.py | 5 ++--- tests/http/test_10_proxy.py | 5 ++--- tests/http/test_11_unix.py | 4 +--- tests/http/test_12_reuse.py | 5 ++--- tests/http/test_13_proxy_auth.py | 5 ++--- tests/http/test_14_auth.py | 5 ++--- tests/http/test_15_tracing.py | 6 ++---- tests/http/test_16_info.py | 5 ++--- tests/http/test_17_ssl_use.py | 5 ++--- tests/http/test_18_methods.py | 5 ++--- tests/http/test_19_shutdown.py | 5 ++--- tests/http/test_20_websockets.py | 5 ++--- tests/http/test_21_resolve.py | 5 ++--- tests/http/test_30_vsftpd.py | 5 ++--- tests/http/test_31_vsftpds.py | 5 ++--- tests/http/test_32_ftps_vsftpd.py | 5 ++--- tests/http/test_40_socks.py | 5 ++--- tests/http/test_50_scp.py | 5 ++--- tests/http/test_51_sftp.py | 5 ++--- tests/http/testenv/__init__.py | 15 +++++++++------ tests/http/testenv/caddy.py | 2 +- tests/http/testenv/certs.py | 12 ++++++++---- tests/http/testenv/client.py | 3 +-- tests/http/testenv/curl.py | 19 +++++++++---------- tests/http/testenv/dante.py | 3 +-- tests/http/testenv/env.py | 3 +-- tests/http/testenv/httpd.py | 8 ++++---- tests/http/testenv/nghttpx.py | 4 ++-- tests/http/testenv/sshd.py | 3 +-- tests/http/testenv/vsftpd.py | 3 +-- tests/negtelnetserver.py | 3 +-- tests/smbserver.py | 5 ++--- 44 files changed, 110 insertions(+), 134 deletions(-) diff --git a/scripts/pythonlint.sh b/scripts/pythonlint.sh index fcebd100db..0164821548 100755 --- a/scripts/pythonlint.sh +++ b/scripts/pythonlint.sh @@ -29,5 +29,5 @@ ruff check --extend-select=B007,B016,C405,C416,COM818,D200,D213,D204,D401,\ D415,FURB129,N818,PERF401,PERF403,PIE790,PIE808,PLW0127,Q004,RUF010,SIM101,\ -SIM117,SIM118,TRY400,TRY401,RET503,RET504,UP004,B018,B904,RSE102,RET505 \ +SIM117,SIM118,TRY400,TRY401,RET503,RET504,UP004,B018,B904,RSE102,RET505,I001 \ "$@" diff --git a/tests/dictserver.py b/tests/dictserver.py index 2c608c2792..8dc33cd0dc 100755 --- a/tests/dictserver.py +++ b/tests/dictserver.py @@ -26,8 +26,7 @@ # """DICT server.""" -from __future__ import (absolute_import, division, print_function, - unicode_literals) +from __future__ import absolute_import, division, print_function, unicode_literals import argparse import logging diff --git a/tests/http/conftest.py b/tests/http/conftest.py index 3715e8c7bc..dddcdc3279 100644 --- a/tests/http/conftest.py +++ b/tests/http/conftest.py @@ -24,17 +24,16 @@ # import logging import os -import sys import platform +import sys from typing import Generator, Union import pytest - from testenv.env import EnvConfig sys.path.append(os.path.join(os.path.dirname(__file__), '.')) -from testenv import Env, Nghttpx, Httpd, NghttpxQuic, NghttpxFwd, Sshd +from testenv import Env, Httpd, Nghttpx, NghttpxFwd, NghttpxQuic, Sshd log = logging.getLogger(__name__) diff --git a/tests/http/scorecard.py b/tests/http/scorecard.py index 573923380b..e5e9e26292 100644 --- a/tests/http/scorecard.py +++ b/tests/http/scorecard.py @@ -32,9 +32,18 @@ import os import re import sys from statistics import mean -from typing import Dict, Any, Optional, List +from typing import Any, Dict, List, Optional -from testenv import Env, Httpd, CurlClient, Caddy, ExecResult, NghttpxQuic, RunProfile, Dante +from testenv import ( + Caddy, + CurlClient, + Dante, + Env, + ExecResult, + Httpd, + NghttpxQuic, + RunProfile, +) log = logging.getLogger(__name__) diff --git a/tests/http/test_01_basic.py b/tests/http/test_01_basic.py index eb328ea733..86f7ad191f 100644 --- a/tests/http/test_01_basic.py +++ b/tests/http/test_01_basic.py @@ -26,11 +26,9 @@ # import logging import re + import pytest - -from testenv import Env -from testenv import CurlClient - +from testenv import CurlClient, Env log = logging.getLogger(__name__) diff --git a/tests/http/test_02_download.py b/tests/http/test_02_download.py index b4ea2a42d1..dc51c25f52 100644 --- a/tests/http/test_02_download.py +++ b/tests/http/test_02_download.py @@ -30,10 +30,9 @@ import logging import os import re import sys + import pytest - -from testenv import Env, CurlClient, LocalClient - +from testenv import CurlClient, Env, LocalClient log = logging.getLogger(__name__) diff --git a/tests/http/test_03_goaway.py b/tests/http/test_03_goaway.py index c327d5f92f..4c57bf2715 100644 --- a/tests/http/test_03_goaway.py +++ b/tests/http/test_03_goaway.py @@ -28,10 +28,9 @@ import logging import time from datetime import timedelta from threading import Thread + import pytest - -from testenv import Env, CurlClient, ExecResult - +from testenv import CurlClient, Env, ExecResult log = logging.getLogger(__name__) diff --git a/tests/http/test_04_stuttered.py b/tests/http/test_04_stuttered.py index 7fa2fe37a5..1c578e2e9e 100644 --- a/tests/http/test_04_stuttered.py +++ b/tests/http/test_04_stuttered.py @@ -25,11 +25,10 @@ ########################################################################### # import logging -from typing import Tuple, List, Dict +from typing import Dict, List, Tuple + import pytest - -from testenv import Env, CurlClient - +from testenv import CurlClient, Env log = logging.getLogger(__name__) diff --git a/tests/http/test_05_errors.py b/tests/http/test_05_errors.py index e6e1ad0705..7a64e3055d 100644 --- a/tests/http/test_05_errors.py +++ b/tests/http/test_05_errors.py @@ -26,10 +26,9 @@ # import logging import os + import pytest - -from testenv import Env, CurlClient - +from testenv import CurlClient, Env log = logging.getLogger(__name__) diff --git a/tests/http/test_06_eyeballs.py b/tests/http/test_06_eyeballs.py index 96fa643270..df547c8662 100644 --- a/tests/http/test_06_eyeballs.py +++ b/tests/http/test_06_eyeballs.py @@ -26,10 +26,9 @@ # import logging import re + import pytest - -from testenv import Env, CurlClient - +from testenv import CurlClient, Env log = logging.getLogger(__name__) diff --git a/tests/http/test_07_upload.py b/tests/http/test_07_upload.py index 070afeb757..d486e04cd5 100644 --- a/tests/http/test_07_upload.py +++ b/tests/http/test_07_upload.py @@ -30,11 +30,10 @@ import logging import os import re import sys -import pytest from typing import List, Union -from testenv import Env, CurlClient, LocalClient, ExecResult - +import pytest +from testenv import CurlClient, Env, ExecResult, LocalClient log = logging.getLogger(__name__) diff --git a/tests/http/test_08_caddy.py b/tests/http/test_08_caddy.py index b854dceb45..c7dd25a8eb 100644 --- a/tests/http/test_08_caddy.py +++ b/tests/http/test_08_caddy.py @@ -29,10 +29,9 @@ import filecmp import logging import os import re + import pytest - -from testenv import Env, CurlClient, Caddy, LocalClient - +from testenv import Caddy, CurlClient, Env, LocalClient log = logging.getLogger(__name__) diff --git a/tests/http/test_09_push.py b/tests/http/test_09_push.py index 35425d11b7..8f4714be07 100644 --- a/tests/http/test_09_push.py +++ b/tests/http/test_09_push.py @@ -26,10 +26,9 @@ # import logging import os + import pytest - -from testenv import Env, CurlClient, LocalClient - +from testenv import CurlClient, Env, LocalClient log = logging.getLogger(__name__) diff --git a/tests/http/test_10_proxy.py b/tests/http/test_10_proxy.py index 37797181f8..1a850312d9 100644 --- a/tests/http/test_10_proxy.py +++ b/tests/http/test_10_proxy.py @@ -29,10 +29,9 @@ import logging import os import re import sys + import pytest - -from testenv import Env, CurlClient, ExecResult - +from testenv import CurlClient, Env, ExecResult log = logging.getLogger(__name__) diff --git a/tests/http/test_11_unix.py b/tests/http/test_11_unix.py index 1432797da2..fe99512a04 100644 --- a/tests/http/test_11_unix.py +++ b/tests/http/test_11_unix.py @@ -31,9 +31,7 @@ from threading import Thread from typing import Generator import pytest - -from testenv import Env, CurlClient - +from testenv import CurlClient, Env log = logging.getLogger(__name__) diff --git a/tests/http/test_12_reuse.py b/tests/http/test_12_reuse.py index 6f267d9862..8ff062d6dc 100644 --- a/tests/http/test_12_reuse.py +++ b/tests/http/test_12_reuse.py @@ -25,10 +25,9 @@ ########################################################################### # import logging + import pytest - -from testenv import Env, CurlClient - +from testenv import CurlClient, Env log = logging.getLogger(__name__) diff --git a/tests/http/test_13_proxy_auth.py b/tests/http/test_13_proxy_auth.py index 0d7e744dca..d74a9f280b 100644 --- a/tests/http/test_13_proxy_auth.py +++ b/tests/http/test_13_proxy_auth.py @@ -27,10 +27,9 @@ import logging import os import re + import pytest - -from testenv import Env, CurlClient, ExecResult - +from testenv import CurlClient, Env, ExecResult log = logging.getLogger(__name__) diff --git a/tests/http/test_14_auth.py b/tests/http/test_14_auth.py index da3e716a68..288e7b5d28 100644 --- a/tests/http/test_14_auth.py +++ b/tests/http/test_14_auth.py @@ -26,10 +26,9 @@ # import logging import os + import pytest - -from testenv import Env, CurlClient - +from testenv import CurlClient, Env log = logging.getLogger(__name__) diff --git a/tests/http/test_15_tracing.py b/tests/http/test_15_tracing.py index c94827aa4f..d1bcc22273 100644 --- a/tests/http/test_15_tracing.py +++ b/tests/http/test_15_tracing.py @@ -26,11 +26,9 @@ # import logging import re + import pytest - -from testenv import Env -from testenv import CurlClient - +from testenv import CurlClient, Env log = logging.getLogger(__name__) diff --git a/tests/http/test_16_info.py b/tests/http/test_16_info.py index 80984a284e..5be5e31b92 100644 --- a/tests/http/test_16_info.py +++ b/tests/http/test_16_info.py @@ -26,10 +26,9 @@ # import logging import os + import pytest - -from testenv import Env, CurlClient - +from testenv import CurlClient, Env log = logging.getLogger(__name__) diff --git a/tests/http/test_17_ssl_use.py b/tests/http/test_17_ssl_use.py index de076c4ad5..b2339dab51 100644 --- a/tests/http/test_17_ssl_use.py +++ b/tests/http/test_17_ssl_use.py @@ -28,10 +28,9 @@ import json import logging import os import re + import pytest - -from testenv import Env, CurlClient, LocalClient - +from testenv import CurlClient, Env, LocalClient log = logging.getLogger(__name__) diff --git a/tests/http/test_18_methods.py b/tests/http/test_18_methods.py index d693b67e89..0063470928 100644 --- a/tests/http/test_18_methods.py +++ b/tests/http/test_18_methods.py @@ -25,10 +25,9 @@ ########################################################################### # import logging + import pytest - -from testenv import Env, CurlClient - +from testenv import CurlClient, Env log = logging.getLogger(__name__) diff --git a/tests/http/test_19_shutdown.py b/tests/http/test_19_shutdown.py index 9e5effd20c..d72ed5a2ec 100644 --- a/tests/http/test_19_shutdown.py +++ b/tests/http/test_19_shutdown.py @@ -27,10 +27,9 @@ import logging import os import re + import pytest - -from testenv import Env, CurlClient, LocalClient - +from testenv import CurlClient, Env, LocalClient log = logging.getLogger(__name__) diff --git a/tests/http/test_20_websockets.py b/tests/http/test_20_websockets.py index 979a7e5db9..fdc9df6eb7 100644 --- a/tests/http/test_20_websockets.py +++ b/tests/http/test_20_websockets.py @@ -32,12 +32,11 @@ import subprocess import time from datetime import datetime, timedelta from typing import Dict + import pytest - -from testenv import Env, CurlClient, LocalClient +from testenv import CurlClient, Env, LocalClient from testenv.ports import alloc_ports_and_do - log = logging.getLogger(__name__) diff --git a/tests/http/test_21_resolve.py b/tests/http/test_21_resolve.py index b211c772f5..35997f2aba 100644 --- a/tests/http/test_21_resolve.py +++ b/tests/http/test_21_resolve.py @@ -27,10 +27,9 @@ import logging import os from datetime import timedelta + import pytest - -from testenv import Env, CurlClient, LocalClient - +from testenv import CurlClient, Env, LocalClient log = logging.getLogger(__name__) diff --git a/tests/http/test_30_vsftpd.py b/tests/http/test_30_vsftpd.py index 194f3db6f8..5991c45553 100644 --- a/tests/http/test_30_vsftpd.py +++ b/tests/http/test_30_vsftpd.py @@ -29,10 +29,9 @@ import filecmp import logging import os import shutil + import pytest - -from testenv import Env, CurlClient, VsFTPD, LocalClient - +from testenv import CurlClient, Env, LocalClient, VsFTPD log = logging.getLogger(__name__) diff --git a/tests/http/test_31_vsftpds.py b/tests/http/test_31_vsftpds.py index a16e6b9fd0..0f8f23e9b6 100644 --- a/tests/http/test_31_vsftpds.py +++ b/tests/http/test_31_vsftpds.py @@ -29,10 +29,9 @@ import filecmp import logging import os import shutil + import pytest - -from testenv import Env, CurlClient, VsFTPD, LocalClient - +from testenv import CurlClient, Env, LocalClient, VsFTPD log = logging.getLogger(__name__) diff --git a/tests/http/test_32_ftps_vsftpd.py b/tests/http/test_32_ftps_vsftpd.py index 2010daec22..5433081d98 100644 --- a/tests/http/test_32_ftps_vsftpd.py +++ b/tests/http/test_32_ftps_vsftpd.py @@ -29,10 +29,9 @@ import filecmp import logging import os import shutil + import pytest - -from testenv import Env, CurlClient, VsFTPD, LocalClient - +from testenv import CurlClient, Env, LocalClient, VsFTPD log = logging.getLogger(__name__) diff --git a/tests/http/test_40_socks.py b/tests/http/test_40_socks.py index 1c844b82aa..0e1d117399 100644 --- a/tests/http/test_40_socks.py +++ b/tests/http/test_40_socks.py @@ -28,10 +28,9 @@ import logging import os import time from typing import Generator + import pytest - -from testenv import Env, CurlClient, Dante - +from testenv import CurlClient, Dante, Env log = logging.getLogger(__name__) diff --git a/tests/http/test_50_scp.py b/tests/http/test_50_scp.py index 56f1d61281..409378a11e 100644 --- a/tests/http/test_50_scp.py +++ b/tests/http/test_50_scp.py @@ -28,10 +28,9 @@ import difflib import filecmp import logging import os + import pytest - -from testenv import Env, CurlClient, Sshd - +from testenv import CurlClient, Env, Sshd log = logging.getLogger(__name__) diff --git a/tests/http/test_51_sftp.py b/tests/http/test_51_sftp.py index ec4de35d53..052c7ef469 100644 --- a/tests/http/test_51_sftp.py +++ b/tests/http/test_51_sftp.py @@ -28,10 +28,9 @@ import difflib import filecmp import logging import os + import pytest - -from testenv import Env, CurlClient, Sshd - +from testenv import CurlClient, Env, Sshd log = logging.getLogger(__name__) diff --git a/tests/http/testenv/__init__.py b/tests/http/testenv/__init__.py index 3c26780d01..c6f6b0dd2e 100644 --- a/tests/http/testenv/__init__.py +++ b/tests/http/testenv/__init__.py @@ -25,16 +25,19 @@ ########################################################################### # ruff: noqa: F401, E402 import pytest + pytest.register_assert_rewrite("testenv.env", "testenv.curl", "testenv.caddy", "testenv.httpd", "testenv.nghttpx") -from .env import Env -from .certs import TestCA, Credentials +# This import must be first to avoid circular imports +from .curl import CurlClient, ExecResult, RunProfile # noqa: I001 + from .caddy import Caddy -from .httpd import Httpd -from .curl import CurlClient, ExecResult, RunProfile +from .certs import Credentials, TestCA from .client import LocalClient -from .nghttpx import Nghttpx, NghttpxQuic, NghttpxFwd -from .vsftpd import VsFTPD from .dante import Dante +from .env import Env +from .httpd import Httpd +from .nghttpx import Nghttpx, NghttpxFwd, NghttpxQuic from .sshd import Sshd +from .vsftpd import VsFTPD diff --git a/tests/http/testenv/caddy.py b/tests/http/testenv/caddy.py index 8805e88c2f..eece1a5a39 100644 --- a/tests/http/testenv/caddy.py +++ b/tests/http/testenv/caddy.py @@ -29,7 +29,7 @@ import os import socket import subprocess import time -from datetime import timedelta, datetime +from datetime import datetime, timedelta from json import JSONEncoder from typing import Dict diff --git a/tests/http/testenv/certs.py b/tests/http/testenv/certs.py index 9848590f05..3e206efcdc 100644 --- a/tests/http/testenv/certs.py +++ b/tests/http/testenv/certs.py @@ -30,8 +30,8 @@ import os import re import shutil import subprocess -from datetime import timedelta, datetime, timezone -from typing import List, Any, Optional +from datetime import datetime, timedelta, timezone +from typing import Any, List, Optional from cryptography import x509 from cryptography.hazmat.backends import default_backend @@ -40,10 +40,14 @@ from cryptography.hazmat.primitives._serialization import PublicFormat from cryptography.hazmat.primitives.asymmetric import ec, rsa from cryptography.hazmat.primitives.asymmetric.ec import EllipticCurvePrivateKey from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey -from cryptography.hazmat.primitives.serialization import Encoding, PrivateFormat, NoEncryption, load_pem_private_key +from cryptography.hazmat.primitives.serialization import ( + Encoding, + NoEncryption, + PrivateFormat, + load_pem_private_key, +) from cryptography.x509 import ExtendedKeyUsageOID, NameOID - EC_SUPPORTED = {} EC_SUPPORTED.update([(curve.name.upper(), curve) for curve in [ ec.SECP192R1, diff --git a/tests/http/testenv/client.py b/tests/http/testenv/client.py index 7f22155c10..36ac8a599e 100644 --- a/tests/http/testenv/client.py +++ b/tests/http/testenv/client.py @@ -29,12 +29,11 @@ import os import shutil import subprocess from datetime import datetime -from typing import Optional, Dict +from typing import Dict, Optional from . import ExecResult from .env import Env - log = logging.getLogger(__name__) diff --git a/tests/http/testenv/curl.py b/tests/http/testenv/curl.py index 3d443700c0..afa3c404e2 100644 --- a/tests/http/testenv/curl.py +++ b/tests/http/testenv/curl.py @@ -27,22 +27,21 @@ import json import logging import os -import sys -import time -from functools import cmp_to_key -from threading import Thread - -import psutil import re import shutil import subprocess -from statistics import mean, fmean -from datetime import timedelta, datetime, timezone -from typing import List, Optional, Dict, Union, Any +import sys +import time +from datetime import datetime, timedelta, timezone +from functools import cmp_to_key +from statistics import fmean, mean +from threading import Thread +from typing import Any, Dict, List, Optional, Union from urllib.parse import urlparse -from .env import Env +import psutil +from .env import Env log = logging.getLogger(__name__) diff --git a/tests/http/testenv/dante.py b/tests/http/testenv/dante.py index 83323bea11..2feb42eb7c 100644 --- a/tests/http/testenv/dante.py +++ b/tests/http/testenv/dante.py @@ -29,8 +29,7 @@ import os import socket import subprocess import time -from datetime import timedelta, datetime - +from datetime import datetime, timedelta from typing import Dict from . import CurlClient diff --git a/tests/http/testenv/env.py b/tests/http/testenv/env.py index d7eaac7bec..9b0ebd7260 100644 --- a/tests/http/testenv/env.py +++ b/tests/http/testenv/env.py @@ -33,14 +33,13 @@ import subprocess import tempfile from configparser import ConfigParser, ExtendedInterpolation from datetime import timedelta -from typing import Optional, Dict, List +from typing import Dict, List, Optional import pytest from filelock import FileLock from .certs import CertificateSpec, Credentials, TestCA - log = logging.getLogger(__name__) diff --git a/tests/http/testenv/httpd.py b/tests/http/testenv/httpd.py index 7a353791ad..655bfc3b7f 100644 --- a/tests/http/testenv/httpd.py +++ b/tests/http/testenv/httpd.py @@ -24,17 +24,17 @@ # ########################################################################### # +import copy import inspect import logging import os import shutil import socket import subprocess -from datetime import timedelta, datetime -from json import JSONEncoder import time -from typing import List, Union, Optional, Dict -import copy +from datetime import datetime, timedelta +from json import JSONEncoder +from typing import Dict, List, Optional, Union from .curl import CurlClient, ExecResult from .env import Env diff --git a/tests/http/testenv/nghttpx.py b/tests/http/testenv/nghttpx.py index 0393c0d078..0d95a34bce 100644 --- a/tests/http/testenv/nghttpx.py +++ b/tests/http/testenv/nghttpx.py @@ -30,11 +30,11 @@ import signal import socket import subprocess import time -from typing import Optional, Dict from datetime import datetime, timedelta +from typing import Dict, Optional -from .env import Env, NghttpxUtil from .curl import CurlClient +from .env import Env, NghttpxUtil from .ports import alloc_ports_and_do log = logging.getLogger(__name__) diff --git a/tests/http/testenv/sshd.py b/tests/http/testenv/sshd.py index 10384fd5e8..e800ced17b 100644 --- a/tests/http/testenv/sshd.py +++ b/tests/http/testenv/sshd.py @@ -30,8 +30,7 @@ import socket import stat import subprocess import time -from datetime import timedelta, datetime - +from datetime import datetime, timedelta from typing import Dict from . import CurlClient diff --git a/tests/http/testenv/vsftpd.py b/tests/http/testenv/vsftpd.py index 09cfc0826a..ace2884c7d 100644 --- a/tests/http/testenv/vsftpd.py +++ b/tests/http/testenv/vsftpd.py @@ -30,9 +30,8 @@ import re import socket import subprocess import time - from datetime import datetime, timedelta -from typing import List, Dict +from typing import Dict, List from .curl import CurlClient, ExecResult from .env import Env diff --git a/tests/negtelnetserver.py b/tests/negtelnetserver.py index f85899bc31..34be28182b 100755 --- a/tests/negtelnetserver.py +++ b/tests/negtelnetserver.py @@ -23,8 +23,7 @@ # """A telnet server which negotiates.""" -from __future__ import (absolute_import, division, print_function, - unicode_literals) +from __future__ import absolute_import, division, print_function, unicode_literals import argparse import logging diff --git a/tests/smbserver.py b/tests/smbserver.py index 14d9e2e352..34d3dabc00 100755 --- a/tests/smbserver.py +++ b/tests/smbserver.py @@ -24,13 +24,13 @@ """Server for testing SMB.""" import argparse +import configparser import logging import os import signal import sys import tempfile import threading -import configparser # Import our curl test data helper from util import ClosingFileHandler, TestData @@ -45,8 +45,7 @@ except ImportError: sys.exit(1) from impacket import smb as imp_smb from impacket import smbserver as imp_smbserver -from impacket.nt_errors import (STATUS_ACCESS_DENIED, STATUS_NO_SUCH_FILE, - STATUS_SUCCESS) +from impacket.nt_errors import STATUS_ACCESS_DENIED, STATUS_NO_SUCH_FILE, STATUS_SUCCESS log = logging.getLogger(__name__) SERVER_MAGIC = "SERVER_MAGIC"