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

     _maintain_cache(cache, local_list)

     return local_list, single_file, exclude_list

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

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

     def _get_remote_attribs(uri, remote_item):

         response = S3(cfg).object_info(uri)

         remote_item.update({

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

         except KeyError:

             pass

-    def _get_filelist_remote(remote_uri, recursive = True, batch_mode = False):

+    def _get_filelist_remote(remote_uri, recursive = True):

         ## If remote_uri ends with '/' then all remote files will have

         ## the remote_uri prefix removed in the relative path.

         ## If, on the other hand, the remote_uri ends with something else

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

         s3 = S3(Config())

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

-                                  recursive = recursive, batch_mode = batch_mode, uri_params = uri_params)

+                                  recursive = recursive, uri_params = uri_params)

         rem_base_original = rem_base = remote_uri.object()

         remote_uri_original = remote_uri

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

     if recursive:

         for uri in remote_uris:

-            objectlist = _get_filelist_remote(uri, batch_mode = batch_mode)

+            objectlist = _get_filelist_remote(uri, recursive = True)

             for key in objectlist:

                 remote_list[key] = objectlist[key]

                 remote_list.record_md5(key, objectlist.get_md5(key))

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

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

         return response

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

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

         def _list_truncated(data):

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

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

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

             response = self.bucket_list_noparse(bucket, prefix, recursive, uri_params)

             current_list = _get_contents(response["data"])

             current_prefixes = _get_common_prefixes(response["data"])

-            truncated = _list_truncated(response["data"]) and not batch_mode

+            truncated = _list_truncated(response["data"])

             if truncated:

                 if current_list:

                     uri_params['marker'] = self.urlencode_string(current_list[-1]["Key"])

@@ -571,12 +571,10 @@ def subcmd_batch_del(uri_str = None, bucket = None, remote_list = None):

     if len([item for item in [uri_str, bucket, remote_list] if item]) != 1:

         raise ValueError("One and only one of 'uri_str', 'bucket', 'remote_list' can be specified.")

-    batch_mode = False

     if bucket:

         uri_str = "s3://%s" % bucket

     if not remote_list:

-        batch_mode = True

-        remote_list, exclude_list = fetch_remote_list(uri_str, require_attribs = False, batch_mode = True)

+        remote_list, exclude_list = fetch_remote_list(uri_str, require_attribs = False)

     if len(remote_list) == 0:

         warning(u"Remote list is empty.")