Merging in latest boto.

boto/s3/bucketlistresultset.py

 # 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
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish, dis-
 # tribute, sublicense, and/or sell copies of the Software, and to permit
 # persons to whom the Software is furnished to do so, subject to the fol-
 # lowing conditions:
 #
@@ skipping 34 matching lines @@
 
     def __init__(self, bucket=None, prefix='', delimiter='', marker='', headers=None):
         self.bucket = bucket
         self.prefix = prefix
         self.delimiter = delimiter
         self.marker = marker
         self.headers = headers
 
     def __iter__(self):
         return bucket_lister(self.bucket, prefix=self.prefix,
-                             delimiter=self.delimiter, marker=self.marker, headers=self.headers)
+                             delimiter=self.delimiter, marker=self.marker,
+                             headers=self.headers)
 
 def versioned_bucket_lister(bucket, prefix='', delimiter='',
                             key_marker='', version_id_marker='', headers=None):
     """
     A generator function for listing versions in a bucket.
     """
     more_results = True
     k = None
     while more_results:
         rs = bucket.get_all_versions(prefix=prefix, key_marker=key_marker,
                                      version_id_marker=version_id_marker,
-                                     delimiter=delimiter, headers=headers)
+                                     delimiter=delimiter, headers=headers,
+                                     max_keys=999)
         for k in rs:
             yield k
         key_marker = rs.next_key_marker
         version_id_marker = rs.next_version_id_marker
         more_results= rs.is_truncated
         
 class VersionedBucketListResultSet:
     """
     A resultset for listing versions within a bucket.  Uses the bucket_lister
     generator function and implements the iterator interface.  This
@@ skipping 52 matching lines @@
         self.upload_id_marker = upload_id_marker
         self.headers = headers
 
     def __iter__(self):
         return multipart_upload_lister(self.bucket,
                                        key_marker=self.key_marker,
                                        upload_id_marker=self.upload_id_marker,
                                        headers=self.headers)