m

Author: Lucas McDonald

DynamoDbEncryption/runtimes/python/pyproject.toml

@@ -52,25 +52,38 @@ optional = true
 
 [tool.poetry.group.linting.dependencies]
 ruff = "^0.11.5"
-pydocstyle = "^6.3.0"
 black = "^25.1.0"
 
 [tool.ruff]
 exclude = [
-    # Don't lint Dafny-generated code
+    # Don't bother linting Dafny-generated code
     "internaldafny",
     # Don't re-lint Smithy-generated code
     "smithygenerated",
 ]
 line-length=120
 indent-width=4
 target-version = "py311"
+select = [
+    # pycodestyle: spacing, line length
+    "E",
+    # pyflakes: unused imports/variables
+    "F",
+    # isort: import sorting
+    "I",
+    # pydocstyle: docstring style
+    "D",
+    # pyupgrade: auto-upgrade syntax if possible
+    "UP",
+]
 
-[tool.pydocstyle]
-match-dir = "^(?!internal$|internaldafny$|smithygenerated$).*"
+[tool.ruff.per-file-ignores]
+# Don't consider internal classes as "public" for linting purposes
+"src/aws_dbesdk_dynamodb/internal/*.py" = ["D100", "D101", "D102"]
 
 [tool.black]
-exclude = "/(internal|internaldafny|smithygenerated)(/|$)"
+# Don't bother linting Dafny-generated code; don't re-lint Smithy-generated code
+exclude = "/(internaldafny|smithygenerated)(/|$)"
 
 [build-system]
 requires = ["poetry-core<2.0.0"]

DynamoDbEncryption/runtimes/python/src/aws_dbesdk_dynamodb/__init__.py

@@ -2,10 +2,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # Initialize generated Dafny
-from .internaldafny.generated import module_
-
 # Initialize externs
 from .internaldafny import extern
+from .internaldafny.generated import module_
 
 """
 boto3 uses Python's decimal library to deserialize numbers retrieved by resources
@@ -27,9 +26,10 @@
 
 For DBESDK DynamoDB, change the DynamoDB context to treat "Rounded" as acceptable.
 """
-import boto3.dynamodb.types
 from decimal import Rounded
 
+import boto3.dynamodb.types
+
 old_context = boto3.dynamodb.types.DYNAMODB_CONTEXT
 old_traps = old_context.__getattribute__("traps")
 # traps structure: {k (trap class) : v (True if trap should raise Exception; False otherwise)}

DynamoDbEncryption/runtimes/python/src/aws_dbesdk_dynamodb/encrypted/boto3_interface.py

@@ -1,13 +1,16 @@
 # Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 import abc
-from typing import Any, Dict
 from abc import abstractmethod
+from typing import Any
+
 
 class EncryptedBotoInterface(abc.ABC):
     """Interface for encrypted boto3 interfaces."""
 
-    def _copy_sdk_response_to_dbesdk_response(self, sdk_response: Dict[str, Any], dbesdk_response: Dict[str, Any]) -> Dict[str, Any]:
+    def _copy_sdk_response_to_dbesdk_response(
+        self, sdk_response: dict[str, Any], dbesdk_response: dict[str, Any]
+    ) -> dict[str, Any]:
         """Copy any missing fields from the SDK response to the DBESDK response.
 
         Args:
@@ -16,6 +19,7 @@ def _copy_sdk_response_to_dbesdk_response(self, sdk_response: Dict[str, Any], db
 
         Returns:
             dict: The DBESDK response with any missing fields copied from SDK response
+
         """
         for sdk_response_key, sdk_response_value in sdk_response.items():
             if sdk_response_key not in dbesdk_response:
@@ -38,6 +42,7 @@ def __getattr__(self, name: str) -> Any:
 
         Raises:
             AttributeError: If the attribute doesn't exist on the underlying client
+
         """
         client_attr = getattr(self, self._boto_client_attr_name)
         if hasattr(client_attr, name):