fix linting issues after bumping ruff target version

alexrashed · alexrashed · commit 98cd3100c02f · 2024-11-19T10:37:32.000+01:00
diff --git a/localstack-core/localstack/services/s3/models.py b/localstack-core/localstack/services/s3/models.py
@@ -5,7 +5,6 @@
 from datetime import datetime
 from secrets import token_urlsafe
 from typing import Literal, NamedTuple, Optional, Union
-
 from zoneinfo import ZoneInfo
 
 from localstack.aws.api import CommonServiceException
diff --git a/localstack-core/localstack/services/s3/storage/ephemeral.py b/localstack-core/localstack/services/s3/storage/ephemeral.py
@@ -334,9 +334,10 @@ def copy_from_object(
         :param range_data: the range data from which the S3Part will copy its data.
         :return: the EphemeralS3StoredObject representing the stored part
         """
-        with self._s3_store.open(
-            src_bucket, src_s3_object, mode="r"
-        ) as src_stored_object, self.open(s3_part, mode="w") as stored_part:
+        with (
+            self._s3_store.open(src_bucket, src_s3_object, mode="r") as src_stored_object,
+            self.open(s3_part, mode="w") as stored_part,
+        ):
             if not range_data:
                 stored_part.write(src_stored_object)
                 return
diff --git a/localstack-core/localstack/services/s3/utils.py b/localstack-core/localstack/services/s3/utils.py
@@ -9,11 +9,11 @@
 from secrets import token_bytes
 from typing import IO, Any, Dict, Literal, NamedTuple, Optional, Protocol, Tuple, Union
 from urllib import parse as urlparser
+from zoneinfo import ZoneInfo
 
 import xmltodict
 from botocore.exceptions import ClientError
 from botocore.utils import InvalidArnException
-from zoneinfo import ZoneInfo
 
 from localstack import config, constants
 from localstack.aws.api import CommonServiceException, RequestContext
diff --git a/localstack-core/localstack/services/s3/validation.py b/localstack-core/localstack/services/s3/validation.py
@@ -1,9 +1,9 @@
 import base64
 import datetime
 import hashlib
+from zoneinfo import ZoneInfo
 
 from botocore.utils import InvalidArnException
-from zoneinfo import ZoneInfo
 
 from localstack.aws.api import CommonServiceException
 from localstack.aws.api.s3 import (
diff --git a/tests/aws/services/events/test_events_patterns.py b/tests/aws/services/events/test_events_patterns.py
@@ -134,9 +134,10 @@ def test_event_pattern_with_multi_key(self, aws_client):
         https://docs.aws.amazon.com/eventbridge/latest/userguide/eb-event-patterns-content-based-filtering.html#eb-filtering-complex-example
         """
 
-        with open(COMPLEX_MULTI_KEY_EVENT, "r") as event_file, open(
-            COMPLEX_MULTI_KEY_EVENT_PATTERN, "r"
-        ) as event_pattern_file:
+        with (
+            open(COMPLEX_MULTI_KEY_EVENT, "r") as event_file,
+            open(COMPLEX_MULTI_KEY_EVENT_PATTERN, "r") as event_pattern_file,
+        ):
             event = event_file.read()
             event_pattern = event_pattern_file.read()
 
diff --git a/tests/aws/services/s3/test_s3.py b/tests/aws/services/s3/test_s3.py
@@ -15,6 +15,7 @@
 from operator import itemgetter
 from typing import TYPE_CHECKING
 from urllib.parse import SplitResult, parse_qs, quote, urlencode, urlparse, urlunsplit
+from zoneinfo import ZoneInfo
 
 import boto3 as boto3
 import pytest
@@ -26,7 +27,6 @@
 from botocore.client import Config
 from botocore.exceptions import ClientError
 from localstack_snapshot.snapshots.transformer import RegexTransformer
-from zoneinfo import ZoneInfo
 
 import localstack.config
 from localstack import config
diff --git a/tests/unit/test_common.py b/tests/unit/test_common.py
@@ -6,10 +6,10 @@
 import time
 import zipfile
 from datetime import date, datetime, timezone
+from zoneinfo import ZoneInfo
 
 import pytest
 import yaml
-from zoneinfo import ZoneInfo
 
 from localstack import config
 from localstack.utils import common
diff --git a/tests/unit/test_docker_utils.py b/tests/unit/test_docker_utils.py
@@ -6,9 +6,10 @@
 
 class TestDockerUtils:
     def test_host_path_for_path_in_docker_windows(self):
-        with mock.patch(
-            "localstack.utils.docker_utils.get_default_volume_dir_mount"
-        ) as get_volume, mock.patch("localstack.config.is_in_docker", True):
+        with (
+            mock.patch("localstack.utils.docker_utils.get_default_volume_dir_mount") as get_volume,
+            mock.patch("localstack.config.is_in_docker", True),
+        ):
             get_volume.return_value = VolumeInfo(
                 type="bind",
                 source=r"C:\Users\localstack\volume\mount",
@@ -23,9 +24,10 @@ def test_host_path_for_path_in_docker_windows(self):
             assert result == r"C:\Users\localstack\volume\mount/some/test/file"
 
     def test_host_path_for_path_in_docker_linux(self):
-        with mock.patch(
-            "localstack.utils.docker_utils.get_default_volume_dir_mount"
-        ) as get_volume, mock.patch("localstack.config.is_in_docker", True):
+        with (
+            mock.patch("localstack.utils.docker_utils.get_default_volume_dir_mount") as get_volume,
+            mock.patch("localstack.config.is_in_docker", True),
+        ):
             get_volume.return_value = VolumeInfo(
                 type="bind",
                 source="/home/some-user/.cache/localstack/volume",
@@ -39,9 +41,10 @@ def test_host_path_for_path_in_docker_linux(self):
             assert result == "/home/some-user/.cache/localstack/volume/some/test/file"
 
     def test_host_path_for_path_in_docker_linux_volume_dir(self):
-        with mock.patch(
-            "localstack.utils.docker_utils.get_default_volume_dir_mount"
-        ) as get_volume, mock.patch("localstack.config.is_in_docker", True):
+        with (
+            mock.patch("localstack.utils.docker_utils.get_default_volume_dir_mount") as get_volume,
+            mock.patch("localstack.config.is_in_docker", True),
+        ):
             get_volume.return_value = VolumeInfo(
                 type="bind",
                 source="/home/some-user/.cache/localstack/volume",
@@ -55,9 +58,10 @@ def test_host_path_for_path_in_docker_linux_volume_dir(self):
             assert result == "/home/some-user/.cache/localstack/volume"
 
     def test_host_path_for_path_in_docker_linux_wrong_path(self):
-        with mock.patch(
-            "localstack.utils.docker_utils.get_default_volume_dir_mount"
-        ) as get_volume, mock.patch("localstack.config.is_in_docker", True):
+        with (
+            mock.patch("localstack.utils.docker_utils.get_default_volume_dir_mount") as get_volume,
+            mock.patch("localstack.config.is_in_docker", True),
+        ):
             get_volume.return_value = VolumeInfo(
                 type="bind",
                 source="/home/some-user/.cache/localstack/volume",
diff --git a/tests/unit/test_s3.py b/tests/unit/test_s3.py
@@ -1,11 +1,11 @@
 import datetime
 import os
 import re
+import zoneinfo
 from io import BytesIO
 from urllib.parse import urlparse
 
 import pytest
-import zoneinfo
 
 from localstack.aws.api import RequestContext
 from localstack.aws.api.s3 import InvalidArgument
