From 756e5d0d6970a087760640ddf606fc67581d2d74 Mon Sep 17 00:00:00 2001 From: leondutoit Date: Mon, 22 Jan 2018 12:48:19 +0100 Subject: [PATCH] add extra headers to all requests, if they exist --- S3/S3.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/S3/S3.py b/S3/S3.py index 995f16ed0..9741d0992 100644 --- a/S3/S3.py +++ b/S3/S3.py @@ -16,6 +16,7 @@ import mimetypes import io import pprint +from copy import copy from xml.sax import saxutils from logging import debug, info, warning, error from stat import ST_SIZE @@ -1123,7 +1124,13 @@ def create_request(self, operation, uri = None, bucket = None, object = None, he method_string = S3.http_methods.getkey(S3.operations[operation] & S3.http_methods["MASK"]) - request = S3Request(self, method_string, resource, headers, body, uri_params) + _headers = copy(headers) + if not _headers and self.config.extra_headers is not None: + _headers = {} + if self.config.extra_headers is not None: + for k,v in self.config.extra_headers.iteritems(): + _headers[k] = v + request = S3Request(self, method_string, resource, _headers, body, uri_params) debug("CreateRequest: resource[uri]=%s", resource['uri']) return request