| Index: third_party/gsutil/boto/boto/resultset.py
|
| diff --git a/third_party/gsutil/20110627/boto/boto/resultset.py b/third_party/gsutil/boto/boto/resultset.py
|
| similarity index 92%
|
| rename from third_party/gsutil/20110627/boto/boto/resultset.py
|
| rename to third_party/gsutil/boto/boto/resultset.py
|
| index 075fc5e3aa094e8ed198f733fc0b214c05a0cc99..6f95d7917e7c5378c3550abc0d454202db730352 100644
|
| --- a/third_party/gsutil/20110627/boto/boto/resultset.py
|
| +++ b/third_party/gsutil/boto/boto/resultset.py
|
| @@ -19,6 +19,8 @@
|
| # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
| # IN THE SOFTWARE.
|
|
|
| +from boto.s3.user import User
|
| +
|
| class ResultSet(list):
|
| """
|
| The ResultSet is used to pass results back from the Amazon services
|
| @@ -48,7 +50,9 @@ class ResultSet(list):
|
| self.markers = []
|
| self.marker = None
|
| self.key_marker = None
|
| + self.next_marker = None # avail when delimiter used
|
| self.next_key_marker = None
|
| + self.next_upload_id_marker = None
|
| self.next_version_id_marker = None
|
| self.version_id_marker = None
|
| self.is_truncated = False
|
| @@ -61,6 +65,12 @@ class ResultSet(list):
|
| obj = t[1](connection)
|
| self.append(obj)
|
| return obj
|
| + if name == 'Owner':
|
| + # Makes owner available for get_service and
|
| + # perhaps other lists where not handled by
|
| + # another element.
|
| + self.owner = User()
|
| + return self.owner
|
| return None
|
|
|
| def to_boolean(self, value, true_value='true'):
|
| @@ -76,6 +86,8 @@ class ResultSet(list):
|
| self.marker = value
|
| elif name == 'KeyMarker':
|
| self.key_marker = value
|
| + elif name == 'NextMarker':
|
| + self.next_marker = value
|
| elif name == 'NextKeyMarker':
|
| self.next_key_marker = value
|
| elif name == 'VersionIdMarker':
|
|
|