only use positional arguments when preparing partially curried functions to avoid the possibility of conflicts when curried functions are used elsewhere

Author: mattsb42-aws

src/dynamodb_encryption_sdk/encrypted/client.py

@@ -70,49 +70,49 @@ def __attrs_post_init__(self):
         )
         self._table_crypto_config = partial(  # attrs confuses pylint: disable=attribute-defined-outside-init
             crypto_config_from_cache,
-            materials_provider=self._materials_provider,
-            attribute_actions=self._attribute_actions,
-            table_info_cache=self._table_info_cache
+            self._materials_provider,
+            self._attribute_actions,
+            self._table_info_cache
         )
         self._item_crypto_config = partial(  # attrs confuses pylint: disable=attribute-defined-outside-init
             crypto_config_from_kwargs,
-            fallback=self._table_crypto_config
+            self._table_crypto_config
         )
         self.get_item = partial(  # attrs confuses pylint: disable=attribute-defined-outside-init
             decrypt_get_item,
-            decrypt_method=decrypt_dynamodb_item,
-            crypto_config_method=self._item_crypto_config,
-            read_method=self._client.get_item
+            decrypt_dynamodb_item,
+            self._item_crypto_config,
+            self._client.get_item
         )
         self.put_item = partial(  # attrs confuses pylint: disable=attribute-defined-outside-init
             encrypt_put_item,
-            encrypt_method=encrypt_dynamodb_item,
-            crypto_config_method=self._item_crypto_config,
-            write_method=self._client.put_item
+            encrypt_dynamodb_item,
+            self._item_crypto_config,
+            self._client.put_item
         )
         self.query = partial(  # attrs confuses pylint: disable=attribute-defined-outside-init
             decrypt_multi_get,
-            decrypt_method=decrypt_dynamodb_item,
-            crypto_config_method=self._item_crypto_config,
-            read_method=self._client.query
+            decrypt_dynamodb_item,
+            self._item_crypto_config,
+            self._client.query
         )
         self.scan = partial(  # attrs confuses pylint: disable=attribute-defined-outside-init
             decrypt_multi_get,
-            decrypt_method=decrypt_dynamodb_item,
-            crypto_config_method=self._item_crypto_config,
-            read_method=self._client.scan
+            decrypt_dynamodb_item,
+            self._item_crypto_config,
+            self._client.scan
         )
         self.batch_get_item = partial(  # attrs confuses pylint: disable=attribute-defined-outside-init
             decrypt_batch_get_item,
-            decrypt_method=decrypt_dynamodb_item,
-            crypto_config_method=self._table_crypto_config,
-            read_method=self._client.batch_get_item
+            decrypt_dynamodb_item,
+            self._table_crypto_config,
+            self._client.batch_get_item
         )
         self.batch_write_item = partial(  # attrs confuses pylint: disable=attribute-defined-outside-init
             encrypt_batch_write_item,
-            encrypt_method=encrypt_dynamodb_item,
-            crypto_config_method=self._table_crypto_config,
-            write_method=self._client.batch_write_item
+            encrypt_dynamodb_item,
+            self._table_crypto_config,
+            self._client.batch_write_item
         )
 
     def __getattr__(self, name):

src/dynamodb_encryption_sdk/encrypted/resource.py

@@ -140,9 +140,9 @@ def __attrs_post_init__(self):
         )
         self._crypto_config = partial(  # attrs confuses pylint: disable=attribute-defined-outside-init
             crypto_config_from_cache,
-            materials_provider=self._materials_provider,
-            attribute_actions=self._attribute_actions,
-            table_info_cache=self._table_info_cache
+            self._materials_provider,
+            self._attribute_actions,
+            self._table_info_cache
         )
         self.tables = EncryptedTablesCollectionManager(  # attrs confuses pylint: disable=attribute-defined-outside-init
             collection=self._resource.tables,
@@ -152,15 +152,15 @@ def __attrs_post_init__(self):
         )
         self.batch_get_item = partial(  # attrs confuses pylint: disable=attribute-defined-outside-init
             decrypt_batch_get_item,
-            decrypt_method=decrypt_python_item,
-            crypto_config_method=self._crypto_config,
-            read_method=self._resource.batch_get_item
+            decrypt_python_item,
+            self._crypto_config,
+            self._resource.batch_get_item
         )
         self.batch_write_item = partial(  # attrs confuses pylint: disable=attribute-defined-outside-init
             encrypt_batch_write_item,
-            encrypt_method=encrypt_python_item,
-            crypto_config_method=self._crypto_config,
-            write_method=self._resource.batch_write_item
+            encrypt_python_item,
+            self._crypto_config,
+            self._resource.batch_write_item
         )
 
     def __getattr__(self, name):

src/dynamodb_encryption_sdk/encrypted/table.py

@@ -88,36 +88,36 @@ def __attrs_post_init__(self):
 
         self._crypto_config = partial(  # attrs confuses pylint: disable=attribute-defined-outside-init
             crypto_config_from_kwargs,
-            fallback=partial(
+            partial(
                 crypto_config_from_table_info,
-                materials_provider=self._materials_provider,
-                attribute_actions=self._attribute_actions,
-                table_info=self._table_info
+                self._materials_provider,
+                self._attribute_actions,
+                self._table_info
             )
         )
         self.get_item = partial(  # attrs confuses pylint: disable=attribute-defined-outside-init
             decrypt_get_item,
-            decrypt_method=decrypt_python_item,
-            crypto_config_method=self._crypto_config,
-            read_method=self._table.get_item
+            decrypt_python_item,
+            self._crypto_config,
+            self._table.get_item
         )
         self.put_item = partial(  # attrs confuses pylint: disable=attribute-defined-outside-init
             encrypt_put_item,
-            encrypt_method=encrypt_python_item,
-            crypto_config_method=self._crypto_config,
-            write_method=self._table.put_item
+            encrypt_python_item,
+            self._crypto_config,
+            self._table.put_item
         )
         self.query = partial(  # attrs confuses pylint: disable=attribute-defined-outside-init
             decrypt_multi_get,
-            decrypt_method=decrypt_python_item,
-            crypto_config_method=self._crypto_config,
-            read_method=self._table.query
+            decrypt_python_item,
+            self._crypto_config,
+            self._table.query
         )
         self.scan = partial(  # attrs confuses pylint: disable=attribute-defined-outside-init
             decrypt_multi_get,
-            decrypt_method=decrypt_python_item,
-            crypto_config_method=self._crypto_config,
-            read_method=self._table.scan
+            decrypt_python_item,
+            self._crypto_config,
+            self._table.scan
         )
 
     def __getattr__(self, name):