| Index: tools/telemetry/third_party/gsutilz/third_party/boto/boto/s3/prefix.py
|
| diff --git a/tools/telemetry/third_party/gsutilz/third_party/gcs-oauth2-boto-plugin/gcs_oauth2_boto_plugin/__init__.py b/tools/telemetry/third_party/gsutilz/third_party/boto/boto/s3/prefix.py
|
| similarity index 62%
|
| copy from tools/telemetry/third_party/gsutilz/third_party/gcs-oauth2-boto-plugin/gcs_oauth2_boto_plugin/__init__.py
|
| copy to tools/telemetry/third_party/gsutilz/third_party/boto/boto/s3/prefix.py
|
| index a70e6515e01f13e404e77ef814accaa5ba5c157e..adf28e935f0df19797a14cd257c6c62937bf2d57 100644
|
| --- a/tools/telemetry/third_party/gsutilz/third_party/gcs-oauth2-boto-plugin/gcs_oauth2_boto_plugin/__init__.py
|
| +++ b/tools/telemetry/third_party/gsutilz/third_party/boto/boto/s3/prefix.py
|
| @@ -1,4 +1,4 @@
|
| -# Copyright 2014 Google Inc. All Rights Reserved.
|
| +# Copyright (c) 2006,2007 Mitch Garnaat http://garnaat.org/
|
| #
|
| # Permission is hereby granted, free of charge, to any person obtaining a
|
| # copy of this software and associated documentation files (the
|
| @@ -14,17 +14,29 @@
|
| # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
| # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
|
| # ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
|
| -# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
| +# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
| # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
| # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
| # IN THE SOFTWARE.
|
|
|
| -from __future__ import absolute_import
|
| +class Prefix(object):
|
| + def __init__(self, bucket=None, name=None):
|
| + self.bucket = bucket
|
| + self.name = name
|
|
|
| -# Import this module so that users can simply import the top-level module. Once
|
| -# imported, boto will pick up our subclasses of AuthHandler.
|
| -from gcs_oauth2_boto_plugin import oauth2_plugin
|
| + def startElement(self, name, attrs, connection):
|
| + return None
|
|
|
| -from gcs_oauth2_boto_plugin.oauth2_helper import SetFallbackClientIdAndSecret
|
| -from gcs_oauth2_boto_plugin.oauth2_helper import SetLock
|
| + def endElement(self, name, value, connection):
|
| + if name == 'Prefix':
|
| + self.name = value
|
| + else:
|
| + setattr(self, name, value)
|
| +
|
| + @property
|
| + def provider(self):
|
| + provider = None
|
| + if self.bucket and self.bucket.connection:
|
| + provider = self.bucket.connection.provider
|
| + return provider
|
|
|
|
|