Skip to content
This repository was archived by the owner on Mar 23, 2026. It is now read-only.

Commit f272f47

Browse files
giogranogiograno
authored
Add pyupgrade rules to ruff (#12953)
1 parent e118075 commit f272f47

File tree

598 files changed

+4952
-5372
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

598 files changed

+4952
-5372
lines changed

‎localstack-core/localstack/aws/api/apigateway/__init__.py‎

Lines changed: 87 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -289,22 +289,21 @@ class ApiStage(TypedDict, total=False):
289289

290290

291291
ListOfARNs = List[ProviderARN]
292-
Authorizer = TypedDict(
293-
"Authorizer",
294-
{
295-
"id": Optional[String],
296-
"name": Optional[String],
297-
"type": Optional[AuthorizerType],
298-
"providerARNs": Optional[ListOfARNs],
299-
"authType": Optional[String],
300-
"authorizerUri": Optional[String],
301-
"authorizerCredentials": Optional[String],
302-
"identitySource": Optional[String],
303-
"identityValidationExpression": Optional[String],
304-
"authorizerResultTtlInSeconds": Optional[NullableInteger],
305-
},
306-
total=False,
307-
)
292+
293+
294+
class Authorizer(TypedDict, total=False):
295+
id: Optional[String]
296+
name: Optional[String]
297+
type: Optional[AuthorizerType]
298+
providerARNs: Optional[ListOfARNs]
299+
authType: Optional[String]
300+
authorizerUri: Optional[String]
301+
authorizerCredentials: Optional[String]
302+
identitySource: Optional[String]
303+
identityValidationExpression: Optional[String]
304+
authorizerResultTtlInSeconds: Optional[NullableInteger]
305+
306+
308307
ListOfAuthorizer = List[Authorizer]
309308

310309

@@ -373,22 +372,17 @@ class CreateApiKeyRequest(ServiceRequest):
373372
tags: Optional[MapOfStringToString]
374373

375374

376-
CreateAuthorizerRequest = TypedDict(
377-
"CreateAuthorizerRequest",
378-
{
379-
"restApiId": String,
380-
"name": String,
381-
"type": AuthorizerType,
382-
"providerARNs": Optional[ListOfARNs],
383-
"authType": Optional[String],
384-
"authorizerUri": Optional[String],
385-
"authorizerCredentials": Optional[String],
386-
"identitySource": Optional[String],
387-
"identityValidationExpression": Optional[String],
388-
"authorizerResultTtlInSeconds": Optional[NullableInteger],
389-
},
390-
total=False,
391-
)
375+
class CreateAuthorizerRequest(TypedDict, total=False):
376+
restApiId: String
377+
name: String
378+
type: AuthorizerType
379+
providerARNs: Optional[ListOfARNs]
380+
authType: Optional[String]
381+
authorizerUri: Optional[String]
382+
authorizerCredentials: Optional[String]
383+
identitySource: Optional[String]
384+
identityValidationExpression: Optional[String]
385+
authorizerResultTtlInSeconds: Optional[NullableInteger]
392386

393387

394388
class CreateBasePathMappingRequest(ServiceRequest):
@@ -417,17 +411,12 @@ class CreateDeploymentRequest(ServiceRequest):
417411
tracingEnabled: Optional[NullableBoolean]
418412

419413

420-
DocumentationPartLocation = TypedDict(
421-
"DocumentationPartLocation",
422-
{
423-
"type": DocumentationPartType,
424-
"path": Optional[String],
425-
"method": Optional[String],
426-
"statusCode": Optional[DocumentationPartLocationStatusCode],
427-
"name": Optional[String],
428-
},
429-
total=False,
430-
)
414+
class DocumentationPartLocation(TypedDict, total=False):
415+
type: DocumentationPartType
416+
path: Optional[String]
417+
method: Optional[String]
418+
statusCode: Optional[DocumentationPartLocationStatusCode]
419+
name: Optional[String]
431420

432421

433422
class CreateDocumentationPartRequest(ServiceRequest):
@@ -889,19 +878,14 @@ class GetDocumentationPartRequest(ServiceRequest):
889878
documentationPartId: String
890879

891880

892-
GetDocumentationPartsRequest = TypedDict(
893-
"GetDocumentationPartsRequest",
894-
{
895-
"restApiId": String,
896-
"type": Optional[DocumentationPartType],
897-
"nameQuery": Optional[String],
898-
"path": Optional[String],
899-
"position": Optional[String],
900-
"limit": Optional[NullableInteger],
901-
"locationStatus": Optional[LocationStatusType],
902-
},
903-
total=False,
904-
)
881+
class GetDocumentationPartsRequest(TypedDict, total=False):
882+
restApiId: String
883+
type: Optional[DocumentationPartType]
884+
nameQuery: Optional[String]
885+
path: Optional[String]
886+
position: Optional[String]
887+
limit: Optional[NullableInteger]
888+
locationStatus: Optional[LocationStatusType]
905889

906890

907891
class GetDocumentationVersionRequest(ServiceRequest):
@@ -1131,27 +1115,26 @@ class IntegrationResponse(TypedDict, total=False):
11311115

11321116

11331117
MapOfIntegrationResponse = Dict[String, IntegrationResponse]
1134-
Integration = TypedDict(
1135-
"Integration",
1136-
{
1137-
"type": Optional[IntegrationType],
1138-
"httpMethod": Optional[String],
1139-
"uri": Optional[String],
1140-
"connectionType": Optional[ConnectionType],
1141-
"connectionId": Optional[String],
1142-
"credentials": Optional[String],
1143-
"requestParameters": Optional[MapOfStringToString],
1144-
"requestTemplates": Optional[MapOfStringToString],
1145-
"passthroughBehavior": Optional[String],
1146-
"contentHandling": Optional[ContentHandlingStrategy],
1147-
"timeoutInMillis": Optional[Integer],
1148-
"cacheNamespace": Optional[String],
1149-
"cacheKeyParameters": Optional[ListOfString],
1150-
"integrationResponses": Optional[MapOfIntegrationResponse],
1151-
"tlsConfig": Optional[TlsConfig],
1152-
},
1153-
total=False,
1154-
)
1118+
1119+
1120+
class Integration(TypedDict, total=False):
1121+
type: Optional[IntegrationType]
1122+
httpMethod: Optional[String]
1123+
uri: Optional[String]
1124+
connectionType: Optional[ConnectionType]
1125+
connectionId: Optional[String]
1126+
credentials: Optional[String]
1127+
requestParameters: Optional[MapOfStringToString]
1128+
requestTemplates: Optional[MapOfStringToString]
1129+
passthroughBehavior: Optional[String]
1130+
contentHandling: Optional[ContentHandlingStrategy]
1131+
timeoutInMillis: Optional[Integer]
1132+
cacheNamespace: Optional[String]
1133+
cacheKeyParameters: Optional[ListOfString]
1134+
integrationResponses: Optional[MapOfIntegrationResponse]
1135+
tlsConfig: Optional[TlsConfig]
1136+
1137+
11551138
Long = int
11561139
ListOfLong = List[Long]
11571140

@@ -1319,16 +1302,15 @@ class UsagePlan(TypedDict, total=False):
13191302

13201303

13211304
ListOfUsagePlan = List[UsagePlan]
1322-
UsagePlanKey = TypedDict(
1323-
"UsagePlanKey",
1324-
{
1325-
"id": Optional[String],
1326-
"type": Optional[String],
1327-
"value": Optional[String],
1328-
"name": Optional[String],
1329-
},
1330-
total=False,
1331-
)
1305+
1306+
1307+
class UsagePlanKey(TypedDict, total=False):
1308+
id: Optional[String]
1309+
type: Optional[String]
1310+
value: Optional[String]
1311+
name: Optional[String]
1312+
1313+
13321314
ListOfUsagePlanKey = List[UsagePlanKey]
13331315

13341316

@@ -1360,29 +1342,24 @@ class PutGatewayResponseRequest(ServiceRequest):
13601342
responseTemplates: Optional[MapOfStringToString]
13611343

13621344

1363-
PutIntegrationRequest = TypedDict(
1364-
"PutIntegrationRequest",
1365-
{
1366-
"restApiId": String,
1367-
"resourceId": String,
1368-
"httpMethod": String,
1369-
"type": IntegrationType,
1370-
"integrationHttpMethod": Optional[String],
1371-
"uri": Optional[String],
1372-
"connectionType": Optional[ConnectionType],
1373-
"connectionId": Optional[String],
1374-
"credentials": Optional[String],
1375-
"requestParameters": Optional[MapOfStringToString],
1376-
"requestTemplates": Optional[MapOfStringToString],
1377-
"passthroughBehavior": Optional[String],
1378-
"cacheNamespace": Optional[String],
1379-
"cacheKeyParameters": Optional[ListOfString],
1380-
"contentHandling": Optional[ContentHandlingStrategy],
1381-
"timeoutInMillis": Optional[NullableInteger],
1382-
"tlsConfig": Optional[TlsConfig],
1383-
},
1384-
total=False,
1385-
)
1345+
class PutIntegrationRequest(TypedDict, total=False):
1346+
restApiId: String
1347+
resourceId: String
1348+
httpMethod: String
1349+
type: IntegrationType
1350+
integrationHttpMethod: Optional[String]
1351+
uri: Optional[String]
1352+
connectionType: Optional[ConnectionType]
1353+
connectionId: Optional[String]
1354+
credentials: Optional[String]
1355+
requestParameters: Optional[MapOfStringToString]
1356+
requestTemplates: Optional[MapOfStringToString]
1357+
passthroughBehavior: Optional[String]
1358+
cacheNamespace: Optional[String]
1359+
cacheKeyParameters: Optional[ListOfString]
1360+
contentHandling: Optional[ContentHandlingStrategy]
1361+
timeoutInMillis: Optional[NullableInteger]
1362+
tlsConfig: Optional[TlsConfig]
13861363

13871364

13881365
class PutIntegrationResponseRequest(ServiceRequest):

‎localstack-core/localstack/aws/api/core.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import functools
2+
from collections.abc import Callable
23
from typing import (
34
Any,
4-
Callable,
55
NamedTuple,
66
ParamSpec,
77
Protocol,
8-
Type,
98
TypedDict,
109
TypeVar,
1110
)
@@ -67,7 +66,7 @@ def __init__(self, code: str, message: str, status_code: int = 400, sender_fault
6766
self.sender_fault = sender_fault
6867

6968

70-
Operation = Type[ServiceRequest]
69+
Operation = type[ServiceRequest]
7170

7271

7372
class ServiceOperation(NamedTuple):

‎localstack-core/localstack/aws/api/events/__init__.py‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -893,23 +893,19 @@ class DisableRuleRequest(ServiceRequest):
893893
EventBusName: Optional[EventBusNameOrArn]
894894

895895

896-
PlacementStrategy = TypedDict(
897-
"PlacementStrategy",
898-
{
899-
"type": Optional[PlacementStrategyType],
900-
"field": Optional[PlacementStrategyField],
901-
},
902-
total=False,
903-
)
896+
class PlacementStrategy(TypedDict, total=False):
897+
type: Optional[PlacementStrategyType]
898+
field: Optional[PlacementStrategyField]
899+
900+
904901
PlacementStrategies = List[PlacementStrategy]
905-
PlacementConstraint = TypedDict(
906-
"PlacementConstraint",
907-
{
908-
"type": Optional[PlacementConstraintType],
909-
"expression": Optional[PlacementConstraintExpression],
910-
},
911-
total=False,
912-
)
902+
903+
904+
class PlacementConstraint(TypedDict, total=False):
905+
type: Optional[PlacementConstraintType]
906+
expression: Optional[PlacementConstraintExpression]
907+
908+
913909
PlacementConstraints = List[PlacementConstraint]
914910

915911

‎localstack-core/localstack/aws/api/logs/__init__.py‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1585,14 +1585,11 @@ class UpperCaseString(TypedDict, total=False):
15851585
withKeys: UpperCaseStringWithKeys
15861586

15871587

1588-
TypeConverterEntry = TypedDict(
1589-
"TypeConverterEntry",
1590-
{
1591-
"key": Key,
1592-
"type": Type,
1593-
},
1594-
total=False,
1595-
)
1588+
class TypeConverterEntry(TypedDict, total=False):
1589+
key: Key
1590+
type: Type
1591+
1592+
15961593
TypeConverterEntries = List[TypeConverterEntry]
15971594

15981595

‎localstack-core/localstack/aws/api/pipes/__init__.py‎

Lines changed: 24 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -511,23 +511,19 @@ class EcsEphemeralStorage(TypedDict, total=False):
511511
sizeInGiB: EphemeralStorageSize
512512

513513

514-
EcsResourceRequirement = TypedDict(
515-
"EcsResourceRequirement",
516-
{
517-
"type": EcsResourceRequirementType,
518-
"value": String,
519-
},
520-
total=False,
521-
)
514+
class EcsResourceRequirement(TypedDict, total=False):
515+
type: EcsResourceRequirementType
516+
value: String
517+
518+
522519
EcsResourceRequirementsList = List[EcsResourceRequirement]
523-
EcsEnvironmentFile = TypedDict(
524-
"EcsEnvironmentFile",
525-
{
526-
"type": EcsEnvironmentFileType,
527-
"value": String,
528-
},
529-
total=False,
530-
)
520+
521+
522+
class EcsEnvironmentFile(TypedDict, total=False):
523+
type: EcsEnvironmentFileType
524+
value: String
525+
526+
531527
EcsEnvironmentFileList = List[EcsEnvironmentFile]
532528

533529

@@ -563,23 +559,19 @@ class EcsTaskOverride(TypedDict, total=False):
563559
TaskRoleArn: Optional[ArnOrJsonPath]
564560

565561

566-
PlacementStrategy = TypedDict(
567-
"PlacementStrategy",
568-
{
569-
"type": Optional[PlacementStrategyType],
570-
"field": Optional[PlacementStrategyField],
571-
},
572-
total=False,
573-
)
562+
class PlacementStrategy(TypedDict, total=False):
563+
type: Optional[PlacementStrategyType]
564+
field: Optional[PlacementStrategyField]
565+
566+
574567
PlacementStrategies = List[PlacementStrategy]
575-
PlacementConstraint = TypedDict(
576-
"PlacementConstraint",
577-
{
578-
"type": Optional[PlacementConstraintType],
579-
"expression": Optional[PlacementConstraintExpression],
580-
},
581-
total=False,
582-
)
568+
569+
570+
class PlacementConstraint(TypedDict, total=False):
571+
type: Optional[PlacementConstraintType]
572+
expression: Optional[PlacementConstraintExpression]
573+
574+
583575
PlacementConstraints = List[PlacementConstraint]
584576

585577

0 commit comments

Comments
 (0)