From c6ed5c6932dbd5787450df0cdcb98acaba397758 Mon Sep 17 00:00:00 2001
From: Matthew Hanson <matt.a.hanson@gmail.com>
Date: Thu, 30 Jul 2020 00:59:01 -0400
Subject: [PATCH] s3.download uses boto3 download_file, and bump version,
 update CHANGELOG

---
 CHANGELOG.md          | 8 +++++++-
 boto3utils/s3.py      | 9 ++++-----
 boto3utils/version.py | 2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d2fc47..da90b8c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [v0.3.1] = 2020-07-29
+
+### Changed
+- s3.download() now uses boto3 download_file for multipart stream downloads to avoid memory errors downloading large files
+
 ## [v0.3.0] = 2020-06-14
 
 ### Changed
@@ -77,7 +82,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 Initial Release
 
 [Unreleased]: https://github.com/matthewhanson/boto3-utils/compare/master...develop
-[v0.3.0]: https://github.com/matthewhanson/boto3-utils/compare/0.3.0...0.2.3
+[v0.3.1]: https://github.com/matthewhanson/boto3-utils/compare/0.3.0...0.3.1
+[v0.3.0]: https://github.com/matthewhanson/boto3-utils/compare/0.2.3...0.3.0
 [v0.2.3]: https://github.com/matthewhanson/boto3-utils/compare/0.2.2...0.2.3
 [v0.2.2]: https://github.com/matthewhanson/boto3-utils/compare/0.2.1...0.2.2
 [v0.2.1]: https://github.com/matthewhanson/boto3-utils/compare/0.2.0...0.2.1
diff --git a/boto3utils/s3.py b/boto3utils/s3.py
index b3ccfd0..ecbdd76 100644
--- a/boto3utils/s3.py
+++ b/boto3utils/s3.py
@@ -124,11 +124,10 @@ def download(self, uri, path=''):
         logger.debug("Downloading %s as %s" % (uri, fout))
         if path != '':
             makedirs(path, exist_ok=True)
-
-        response = self.get_object(s3_uri['bucket'], s3_uri['key'])
-
-        with open(fout, 'wb') as f:
-            f.write(response['Body'].read())
+        extra_args = None
+        if self.requester_pays:
+            extra_args = {'RequestPayer': 'requester'}
+        self.s3.download_file(s3_uri['bucket'], s3_uri['key'], fout, ExtraArgs=extra_args)
         return fout
 
     def read(self, url):
diff --git a/boto3utils/version.py b/boto3utils/version.py
index 0404d81..e1424ed 100644
--- a/boto3utils/version.py
+++ b/boto3utils/version.py
@@ -1 +1 @@
-__version__ = '0.3.0'
+__version__ = '0.3.1'