From 80fd0bf1309ba7084508a2a0ad533f6949d8bf47 Mon Sep 17 00:00:00 2001 From: Akim Juillerat Date: Tue, 5 Oct 2021 16:33:48 +0200 Subject: [PATCH] attachment_s3: Fix TypeError after setting bucket_name in s3 resource params --- attachment_s3/models/ir_attachment.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/attachment_s3/models/ir_attachment.py b/attachment_s3/models/ir_attachment.py index 3c69e80..bed2aea 100644 --- a/attachment_s3/models/ir_attachment.py +++ b/attachment_s3/models/ir_attachment.py @@ -45,7 +45,6 @@ class IrAttachment(models.Model): bucket_name = bucket_name or os.environ.get('AWS_BUCKETNAME') # replaces {db} by the database name to handle multi-tenancy bucket_name = bucket_name.format(db=self.env.cr.dbname) - params = { 'aws_access_key_id': access_key, 'aws_secret_access_key': secret_key, @@ -74,7 +73,9 @@ class IrAttachment(models.Model): """ params = self._get_s3_connection_params(bucket_name=name) - bucket_name = params.get('bucket_name') + # Pop the bucket_name to avoid TypeError: resource() got an unexpected + # keyword argument 'bucket_name' + bucket_name = params.pop("bucket_name") if not ( params["aws_access_key_id"] and params["aws_secret_access_key"] and