| Index: tools/telemetry/third_party/gsutilz/third_party/boto/boto/cloudfront/object.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/cloudfront/object.py
|
| similarity index 58%
|
| 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/cloudfront/object.py
|
| index a70e6515e01f13e404e77ef814accaa5ba5c157e..24fc85064cadc60b81e5ff518cfaf821ab20dd51 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/cloudfront/object.py
|
| @@ -1,4 +1,4 @@
|
| -# Copyright 2014 Google Inc. All Rights Reserved.
|
| +# Copyright (c) 2006-2009 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
|
| @@ -19,12 +19,30 @@
|
| # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
| # IN THE SOFTWARE.
|
|
|
| -from __future__ import absolute_import
|
| +from boto.s3.key import Key
|
|
|
| -# 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
|
| +class Object(Key):
|
| +
|
| + def __init__(self, bucket, name=None):
|
| + super(Object, self).__init__(bucket, name=name)
|
| + self.distribution = bucket.distribution
|
| +
|
| + def __repr__(self):
|
| + return '<Object: %s/%s>' % (self.distribution.config.origin, self.name)
|
| +
|
| + def url(self, scheme='http'):
|
| + url = '%s://' % scheme
|
| + url += self.distribution.domain_name
|
| + if scheme.lower().startswith('rtmp'):
|
| + url += '/cfx/st/'
|
| + else:
|
| + url += '/'
|
| + url += self.name
|
| + return url
|
| +
|
| +class StreamingObject(Object):
|
| +
|
| + def url(self, scheme='rtmp'):
|
| + return super(StreamingObject, self).url(scheme)
|
|
|
| -from gcs_oauth2_boto_plugin.oauth2_helper import SetFallbackClientIdAndSecret
|
| -from gcs_oauth2_boto_plugin.oauth2_helper import SetLock
|
|
|
|
|