Correctly pass boto3 resource to writers

CHANGELOG.md

@@ -1,5 +1,6 @@
 # Unreleased
 
+- Correctly pass boto3 resource to writers (PR [#576](https://github.com/RaRe-Technologies/smart_open/pull/576), [@jackluo923](https://github.com/jackluo923))
 - Improve robustness of S3 reading (PR [#552](https://github.com/RaRe-Technologies/smart_open/pull/552), [@mpenkov](https://github.com/mpenkov))
 
 # 4.1.0, 30 Dec 2020

smart_open/s3.py

@@ -261,6 +261,7 @@ def open(
                 key_id,
                 min_part_size=min_part_size,
                 session=session,
+                resource=resource,
                 upload_kwargs=multipart_upload_kwargs,
                 resource_kwargs=resource_kwargs,
             )
@@ -269,6 +270,7 @@ def open(
                 bucket_id,
                 key_id,
                 session=session,
+                resource=resource,
                 upload_kwargs=singlepart_upload_kwargs,
                 resource_kwargs=resource_kwargs,
             )

smart_open/tests/test_s3.py

@@ -938,6 +938,64 @@ def test_failure(self):
         self.assertEqual(partial.call_count, 3)
 
 
+@moto.mock_s3()
+def test_resource_propagation_singlepart():
+    """Does the resource parameter make it from the caller to Boto3?"""
+    #
+    # Not sure why we need to create the bucket here, as setUpModule should
+    # have done that for us by now.
+    #
+    session = boto3.Session()
+    resource = session.resource('s3')
+    bucket = resource.create_bucket(Bucket=BUCKET_NAME)
+    bucket.wait_until_exists()
+
+    with smart_open.s3.open(
+        BUCKET_NAME,
+        WRITE_KEY_NAME,
+        mode='wb',
+        resource=resource,
+        multipart_upload=False,
+    ) as writer:
+        assert writer._resource == resource
+        assert id(writer._resource) == id(resource)
+
+
+@moto.mock_s3()
+def test_resource_propagation_multipart():
+    """Does the resource parameter make it from the caller to Boto3?"""
+    session = boto3.Session()
+    resource = session.resource('s3')
+    bucket = resource.create_bucket(Bucket=BUCKET_NAME)
+    bucket.wait_until_exists()
+
+    with smart_open.s3.open(
+        BUCKET_NAME,
+        WRITE_KEY_NAME,
+        mode='wb',
+        resource=resource,
+        multipart_upload=True,
+    ) as writer:
+        assert writer._resource == resource
+        assert id(writer._resource) == id(resource)
+
+
+@moto.mock_s3()
+def test_resource_propagation_reader():
+    """Does the resource parameter make it from the caller to Boto3?"""
+    session = boto3.Session()
+    resource = session.resource('s3')
+    bucket = resource.create_bucket(Bucket=BUCKET_NAME)
+    bucket.wait_until_exists()
+
+    with smart_open.s3.open(BUCKET_NAME, WRITE_KEY_NAME, mode='wb') as writer:
+        writer.write(b'hello world')
+
+    with smart_open.s3.open(BUCKET_NAME, WRITE_KEY_NAME, mode='rb', resource=resource) as reader:
+        assert reader._resource == resource
+        assert id(reader._resource) == id(resource)
+
+
 if __name__ == '__main__':
     logging.basicConfig(format='%(asctime)s : %(levelname)s : %(message)s', level=logging.INFO)
     unittest.main()