libcloud-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthonys...@apache.org
Subject [3/8] libcloud git commit: Prefix non-base-class kw arg with ex_ Closes #1076
Date Fri, 11 Aug 2017 04:34:51 GMT
Prefix non-base-class kw arg with ex_
Closes #1076


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/29810d7a
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/29810d7a
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/29810d7a

Branch: refs/heads/trunk
Commit: 29810d7add4ec3b5530a9750e7a094033aeee7bd
Parents: 2e8da9b
Author: ayleph <ayleph@thisshitistemp.com>
Authored: Sat Jun 24 13:34:16 2017 -0700
Committer: Anthony Shaw <anthonyshaw@apache.org>
Committed: Fri Aug 11 14:30:43 2017 +1000

----------------------------------------------------------------------
 libcloud/storage/drivers/cloudfiles.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/29810d7a/libcloud/storage/drivers/cloudfiles.py
----------------------------------------------------------------------
diff --git a/libcloud/storage/drivers/cloudfiles.py b/libcloud/storage/drivers/cloudfiles.py
index 12b2332..ba2ed76 100644
--- a/libcloud/storage/drivers/cloudfiles.py
+++ b/libcloud/storage/drivers/cloudfiles.py
@@ -310,7 +310,7 @@ class CloudFilesStorageDriver(StorageDriver, OpenStackDriverMixin):
 
         raise LibcloudError('Unexpected status code: %s' % (response.status))
 
-    def get_container_cdn_url(self, container, ssl_uri=False):
+    def get_container_cdn_url(self, container, ex_ssl_uri=False):
         # pylint: disable=unexpected-keyword-arg
         container_name_encoded = self._encode_container_name(container.name)
         response = self.connection.request('/%s' % (container_name_encoded),
@@ -318,7 +318,7 @@ class CloudFilesStorageDriver(StorageDriver, OpenStackDriverMixin):
                                            cdn_request=True)
 
         if response.status == httplib.NO_CONTENT:
-            if ssl_uri:
+            if ex_ssl_uri:
                 cdn_url = response.headers['x-cdn-ssl-uri']
             else:
                 cdn_url = response.headers['x-cdn-uri']


Mime
View raw message