| Index: tools/telemetry/third_party/gsutilz/third_party/boto/boto/s3/deletemarker.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/deletemarker.py
|
| similarity index 50%
|
| 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/deletemarker.py
|
| index a70e6515e01f13e404e77ef814accaa5ba5c157e..d8e7cc8b58cb548c1738a88b31c0fd2e67c3e6e4 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/deletemarker.py
|
| @@ -1,4 +1,4 @@
|
| -# Copyright 2014 Google Inc. All Rights Reserved.
|
| +# Copyright (c) 2006-2010 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,37 @@
|
| # 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.user import User
|
|
|
| -# 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 DeleteMarker(object):
|
| + def __init__(self, bucket=None, name=None):
|
| + self.bucket = bucket
|
| + self.name = name
|
| + self.version_id = None
|
| + self.is_latest = False
|
| + self.last_modified = None
|
| + self.owner = None
|
|
|
| -from gcs_oauth2_boto_plugin.oauth2_helper import SetFallbackClientIdAndSecret
|
| -from gcs_oauth2_boto_plugin.oauth2_helper import SetLock
|
| + def startElement(self, name, attrs, connection):
|
| + if name == 'Owner':
|
| + self.owner = User(self)
|
| + return self.owner
|
| + else:
|
| + return None
|
|
|
| + def endElement(self, name, value, connection):
|
| + if name == 'Key':
|
| + self.name = value
|
| + elif name == 'IsLatest':
|
| + if value == 'true':
|
| + self.is_latest = True
|
| + else:
|
| + self.is_latest = False
|
| + elif name == 'LastModified':
|
| + self.last_modified = value
|
| + elif name == 'Owner':
|
| + pass
|
| + elif name == 'VersionId':
|
| + self.version_id = value
|
| + else:
|
| + setattr(self, name, value)
|
|
|