Changing names of the class

Author: Rakshil Modi

awscli/customizations/s3/s3handler.py

@@ -97,7 +97,7 @@ def __call__(self, transfer_manager, result_queue):
             result_queue, result_recorder, result_processor
         )
         if self._requires_batch_handler():
-            return BatchS3Handler(
+            return BatchS3TransferHandler(
                 transfer_manager, self._cli_params, command_result_recorder
             )
         return S3TransferHandler(
@@ -637,7 +637,7 @@ def create_batches(self, fileinfos):
         raise NotImplementedError('create_batches()')
 
 
-class DeleteBatch(BatchBase):
+class BatchDelete(BatchBase):
     """
     Specialized batch class for delete operations.
     Creates batches in S3 delete-objects API format.
@@ -690,7 +690,7 @@ def get_delete_batches(self, fileinfos):
         return self.create_batches(fileinfos)
 
 
-class BatchS3Handler:
+class BatchS3TransferHandler:
     def __init__(self, transfer_manager, cli_params, result_command_recorder):
         """
         Backend for performing S3 batch transfers .
@@ -718,7 +718,7 @@ def __init__(self, transfer_manager, cli_params, result_command_recorder):
         )
         # Submitter list for batch request submitters
         self._batch_submitters = [
-            DeleteBatchRequestSubmitter(*submitter_args),
+            BatchDeleteRequestSubmitter(*submitter_args),
         ]
 
     def call(self, fileinfos):
@@ -755,7 +755,7 @@ def call(self, fileinfos):
         return self._result_command_recorder.get_command_result()
 
 
-class DeleteBatchRequestSubmitter:
+class BatchDeleteRequestSubmitter:
     def __init__(self, transfer_manager, result_queue, cli_params):
         """Submits transfer requests to the TransferManager
 
@@ -786,7 +786,7 @@ def can_submit(self, fileinfo):
 
     def submit_batch(self, fileinfos):
         """Submit a batch of versionedFileInfo for deletion"""
-        delete_batch = DeleteBatch(self._result_queue)
+        delete_batch = BatchDelete(self._result_queue)
         batches = delete_batch.get_delete_batches(fileinfos)
         if self._cli_params.get('dryrun'):
             return self._submit_dryrun(batches)

tests/unit/customizations/s3/test_s3handler.py

@@ -30,10 +30,10 @@
     SuccessResult,
 )
 from awscli.customizations.s3.s3handler import (
-    BatchS3Handler,
+    BatchDelete,
+    BatchDeleteRequestSubmitter,
+    BatchS3TransferHandler,
     CopyRequestSubmitter,
-    DeleteBatch,
-    DeleteBatchRequestSubmitter,
     DeleteRequestSubmitter,
     DownloadRequestSubmitter,
     DownloadStreamRequestSubmitter,
@@ -89,7 +89,7 @@ def test_call_returns_batch_s3_handler_with_all_versions(self):
         self.assertTrue(factory._requires_batch_handler())
         self.assertIsInstance(
             factory(self.transfer_manager, self.result_queue),
-            BatchS3Handler,
+            BatchS3TransferHandler,
         )
 
 
@@ -1269,7 +1269,7 @@ def test_dry_run(self):
         self.assertIsNone(result.dest)
 
 
-class TestBatchS3Handler:
+class TestBatchS3TransferHandler:
     @pytest.fixture(autouse=True)
     def setUp(self):
         self.result_queue = queue.Queue()
@@ -1287,7 +1287,7 @@ def setUp(self):
         self.transfer_manager.__enter__ = mock.Mock()
         self.transfer_manager.__exit__ = mock.Mock()
         self.parameters = {}
-        self.batch_s3_handler = BatchS3Handler(
+        self.batch_s3_handler = BatchS3TransferHandler(
             self.transfer_manager,
             self.parameters,
             self.command_result_recorder,
@@ -1337,10 +1337,10 @@ def test_notifies_total_submissions(self):
         )
 
 
-class TestDeleteBatch:
+class TestBatchDelete:
     def test_create_batches_with_multiple_objects(self):
         self.result_queue = queue.Queue()
-        self.delete_batch = DeleteBatch(self.result_queue)
+        self.delete_batch = BatchDelete(self.result_queue)
         self.bucket = 'mybucket'
         self.key = 'mykey'
         fileinfos = []
@@ -1363,15 +1363,15 @@ def test_create_batches_with_multiple_objects(self):
             assert batch['bucket'] == self.bucket
 
 
-class TestDeleteBatchRequestSubmitter:
+class TestBatchDeleteRequestSubmitter:
     @pytest.fixture(autouse=True)
     def setUp(self):
         self._transfer_manager = mock.Mock(spec=TransferManager)
         self._result_queue = queue.Queue()
         self._cli_params = {}
         self.bucket = 'mybucket'
         self.key = 'mykey'
-        self.delete_batch_submitter = DeleteBatchRequestSubmitter(
+        self.delete_batch_submitter = BatchDeleteRequestSubmitter(
             self._transfer_manager, self._result_queue, self._cli_params
         )