Port jschneier#96 to s3boto3

mbarrien · Jan 13, 2016 · 522fbab · 522fbab
1 parent 785e0c5
commit 522fbab
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/storages/backends/s3boto3.py b/storages/backends/s3boto3.py
@@ -515,18 +515,21 @@ def modified_time(self, name):
             entry = self.bucket.Object(self._encode_name(name))
         return entry.last_modified
 
-    def url(self, name, parameters=None):
+    def url(self, name, parameters=None, expire=None):
         # Preserve the trailing slash after normalizing the path.
         # TODO(mbarrien): Handle force_http=not self.secure_urls
         name = self._normalize_name(self._clean_name(name))
         if self.custom_domain:
             return "%s//%s/%s" % (self.url_protocol,
                                   self.custom_domain, filepath_to_uri(name))
+        if expire is None:
+            expire = self.querystring_expire
+
         params = parameters.copy() if parameters else {}
         params['Bucket'] = self.bucket.name
         params['Key'] = self._encode_name(name)
         url = self.bucket.meta.client.generate_presigned_url('get_object', Params=params,
-                                                             ExpiresIn=self.querystring_expire)
+                                                             ExpiresIn=expire)
         if self.querystring_auth:
             return url