diff --git a/CHANGELOG.md b/CHANGELOG.md index a149ee0..4e591e9 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.2.3] - 2020-05-06 + +### Fixed +- Syntax error with s3().upload_json + ## [v0.2.2] - 2020-05-05 ### Added @@ -67,6 +72,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.2.3]: https://github.com/matthewhanson/boto3-utils/compare/0.2.3...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 [v0.2.0]: https://github.com/matthewhanson/boto3-utils/compare/0.1.3...0.2.0 [v0.1.3]: https://github.com/matthewhanson/boto3-utils/compare/0.1.2...0.1.3 diff --git a/boto3utils/s3.py b/boto3utils/s3.py index f5c8b42..7ec54c3 100644 --- a/boto3utils/s3.py +++ b/boto3utils/s3.py @@ -87,14 +87,14 @@ def upload(self, filename, url, public=False, extra={}, http_url=False): else: return url_out - def upload_json(self, data, url, **kwargs): + def upload_json(self, data, url, extra={}, **kwargs): """ Upload dictionary as JSON to URL """ tmpdir = mkdtemp() filename = op.join(tmpdir, 'catalog.json') _extra = { 'ContentType': 'application/json' } - _extra.update(kwargs.pop('extra', {})) + _extra.update(extra) with open(filename, 'w') as f: f.write(json.dumps(data)) try: diff --git a/boto3utils/version.py b/boto3utils/version.py index 020ed73..d93b5b2 100644 --- a/boto3utils/version.py +++ b/boto3utils/version.py @@ -1 +1 @@ -__version__ = '0.2.2' +__version__ = '0.2.3'