Incorporate patch from svetlyak.40wt. Fixes issue 393.

boto · Jun 18, 2010 · fa1aa8e · fa1aa8e
1 parent 8d08548
commit fa1aa8e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/boto/resultset.py b/boto/resultset.py
@@ -45,6 +45,8 @@ def __init__(self, marker_elem=None):
             self.markers = []
         self.marker = None
         self.key_marker = None
+        self.next_key_marker = None
+        self.next_version_id_marker = None
         self.version_id_marker = None
         self.is_truncated = False
         self.next_token = None
@@ -73,6 +75,10 @@ def endElement(self, name, value, connection):
             self.key_marker = value
         elif name == 'VersionIdMarker':
             self.version_id_marker = value
+        elif name == 'NextKeyMarker':
+            self.next_key_marker = value
+        elif name == 'NextVersionIdMarker':
+            self.next_version_id_marker = value
         elif name == 'Prefix':
             self.prefix = value
         elif name == 'return':

diff --git a/boto/s3/bucketlistresultset.py b/boto/s3/bucketlistresultset.py
@@ -67,8 +67,8 @@ def versioned_bucket_lister(bucket, prefix='', delimiter='',
                                      delimiter=delimiter, headers=headers)
         for k in rs:
             yield k
-        key_marker = rs.key_marker
-        version_id_marker = rs.version_id_marker
+        key_marker = rs.next_key_marker
+        version_id_marker = rs.next_version_id_marker
         more_results= rs.is_truncated
 
 class VersionedBucketListResultSet: