@@ -322,7 +322,7 @@ def fetch_local_list(args, is_src = False, recursive = None):

     return local_list, single_file

-def fetch_remote_list(args, require_attribs = False, recursive = None, batch_mode = False):

+def fetch_remote_list(args, require_attribs = False, recursive = None, batch_mode = False, uri_params = {}):

     def _get_remote_attribs(uri, remote_item):

         response = S3(cfg).object_info(uri)

         remote_item.update({

@@ -357,7 +357,8 @@ def fetch_remote_list(args, require_attribs = False, recursive = None, batch_mod

         empty_fname_re = re.compile(r'\A\s*\Z')

         s3 = S3(Config())

-        response = s3.bucket_list(remote_uri.bucket(), prefix = remote_uri.object(), recursive = recursive, batch_mode = batch_mode)

+        response = s3.bucket_list(remote_uri.bucket(), prefix = remote_uri.object(),

+                                  recursive = recursive, batch_mode = batch_mode, uri_params = uri_params)

         rem_base_original = rem_base = remote_uri.object()

         remote_uri_original = remote_uri

@@ -226,7 +226,7 @@ class S3(object):

         response["list"] = getListFromXml(response["data"], "Bucket")

         return response

-    def bucket_list(self, bucket, prefix = None, recursive = None, batch_mode = False):

+    def bucket_list(self, bucket, prefix = None, recursive = None, batch_mode = False, uri_params = {}):

         def _list_truncated(data):

             ## <IsTruncated> can either be "true" or "false" or be missing completely

             is_truncated = getTextFromXml(data, ".//IsTruncated") or "false"

@@ -238,7 +238,6 @@ class S3(object):

         def _get_common_prefixes(data):

             return getListFromXml(data, "CommonPrefixes")

-        uri_params = {}

         truncated = True

         list = []

         prefixes = []

@@ -242,14 +242,17 @@ def cmd_website_delete(args):

                 raise

 def cmd_bucket_delete(args):

-    def _bucket_delete_one(uri):

+    def _bucket_delete_one(uri, args = None):

         try:

+            marker = args.get('marker', '') if args else ''

             response = s3.bucket_delete(uri.bucket())

         except S3Error, e:

             if e.info['Code'] == 'BucketNotEmpty' and (cfg.force or cfg.recursive):

                 warning(u"Bucket is not empty. Removing all the objects from it first. This may take some time...")

-                subcmd_object_del_uri(uri.uri(), recursive = True, batch_mode = True)

-                return _bucket_delete_one(uri)

+                batch_uri_args = {'marker': marker}

+                marker = subcmd_object_del_uri(uri.uri(), recursive = True, 

+                                               batch_mode = True, batch_uri_args = batch_uri_args)

+                return _bucket_delete_one(uri, args = {'marker': marker})

             elif S3.codes.has_key(e.info["Code"]):

                 error(S3.codes[e.info["Code"]] % uri.bucket())

                 return

@@ -508,13 +511,14 @@ def cmd_object_del(args):

                 raise ParameterError("File name required, not only the bucket name. Alternatively use --recursive")

         subcmd_object_del_uri(uri_str)

-def subcmd_object_del_uri(uri_str, recursive = None, batch_mode = False):

+def subcmd_object_del_uri(uri_str, recursive = None, batch_mode = False, batch_uri_args = {}):

     s3 = S3(cfg)

     if recursive is None:

         recursive = cfg.recursive

-    remote_list = fetch_remote_list(uri_str, require_attribs = False, recursive = recursive, batch_mode = batch_mode)

+    remote_list = fetch_remote_list(uri_str, require_attribs = False, recursive = recursive, 

+                                    batch_mode = batch_mode, uri_params = batch_uri_args)

     remote_list, exclude_list = filter_exclude_include(remote_list)

     remote_count = len(remote_list)

@@ -535,18 +539,26 @@ def subcmd_object_del_uri(uri_str, recursive = None, batch_mode = False):

     if batch_mode:

         response = s3.object_batch_delete(remote_list)

+        keys_count = len(remote_list) if remote_list else 0

         first_key = S3Uri(remote_list[remote_list.keys()[0]]['object_uri_str']) if remote_list else "None"

         last_key = S3Uri(remote_list[remote_list.keys()[-1]]['object_uri_str']) if remote_list else "None"

-        output(u"Number of deleted keys: %d" % len(remote_list))

+        output(u"Number of deleted keys: %d" % keys_count)

         output(u"From: \t%s" % first_key)

         output(u"To: \t%s" % last_key)

         remote_list = []

+        if keys_count == 1000:

+            # reached limit of keys, probably there are more..

+            # worst case scenario we do a useless listing but that's ok

+            marker = last_key.object() if last_key != "None" and last_key.has_object() else ''

+            return marker 

     for key in remote_list:

         item = remote_list[key]

         response = s3.object_delete(S3Uri(item['object_uri_str']))

         output(u"File %s deleted" % item['object_uri_str'])

+    return ''

+

 def cmd_object_restore(args):

     s3 = S3(cfg)