lint and format

Author: kdaily

awscli/customizations/s3/results.py

@@ -316,7 +316,12 @@ class ResultPrinter(BaseResultHandler):
     SRC_TRANSFER_LOCATION_FORMAT = '{src}'
 
     def __init__(
-        self, result_recorder, out_file=None, error_file=None, frequency=0, oneline=True
+        self,
+        result_recorder,
+        out_file=None,
+        error_file=None,
+        frequency=0,
+        oneline=True,
     ):
         """Prints status of ongoing transfer
 
@@ -356,21 +361,20 @@ def __init__(
 
     def __call__(self, result):
         """Print the progress of the ongoing transfer based on a result"""
-        result_handler = self._result_handler_map.get(type(result), self._print_noop)
-        if type(result) is ProgressResult:                
+        result_handler = self._result_handler_map.get(
+            type(result), self._print_noop
+        )
+        if type(result) is ProgressResult:
             result_handler = self._override_progress_result_handler(
                 result, result_handler
             )
         result_handler(result=result)
 
     def _override_progress_result_handler(self, result, result_handler):
-        if (
-            type(result) in [ProgressResult]
-            and (
-                self._first
-                or (self._frequency == 0)
-                or (time.time() - self._now >= self._frequency)
-            )
+        if type(result) in [ProgressResult] and (
+            self._first
+            or (self._frequency == 0)
+            or (time.time() - self._now >= self._frequency)
         ):
             self._now = time.time()
             self._first = False

awscli/customizations/s3/subcommands.py

@@ -543,9 +543,7 @@
     'name': 'progress-multiline',
     'dest': 'progress_multiline',
     'action': 'store_true',
-    'help_text': (
-        'Show progress on multiple lines.'
-    ),
+    'help_text': ('Show progress on multiple lines.'),
 }
 
 
@@ -738,7 +736,7 @@ class ListCommand(S3Command):
     ]
 
     def _run_main(self, parsed_args, parsed_globals):
-        super(ListCommand, self)._run_main(parsed_args, parsed_globals)
+        super()._run_main(parsed_args, parsed_globals)
         self._empty_result = False
         self._at_first_page = True
         self._size_accumulator = 0
@@ -881,7 +879,7 @@ def _make_last_mod_str(self, last_mod):
             str(last_mod.minute).zfill(2),
             str(last_mod.second).zfill(2),
         )
-        last_mod_str = "%s-%s-%s %s:%s:%s" % last_mod_tup
+        last_mod_str = "%s-%s-%s %s:%s:%s" % last_mod_tup  # noqa: UP031
         return last_mod_str.ljust(19, ' ')
 
     def _make_size_str(self, size):
@@ -923,7 +921,7 @@ class WebsiteCommand(S3Command):
     ]
 
     def _run_main(self, parsed_args, parsed_globals):
-        super(WebsiteCommand, self)._run_main(parsed_args, parsed_globals)
+        super()._run_main(parsed_args, parsed_globals)
         bucket = self._get_bucket_name(parsed_args.paths[0])
         website_configuration = self._build_website_configuration(parsed_args)
         self.client.put_bucket_website(
@@ -981,7 +979,7 @@ class PresignCommand(S3Command):
     ]
 
     def _run_main(self, parsed_args, parsed_globals):
-        super(PresignCommand, self)._run_main(parsed_args, parsed_globals)
+        super()._run_main(parsed_args, parsed_globals)
         path = parsed_args.path
         if path.startswith('s3://'):
             path = path[5:]
@@ -998,7 +996,7 @@ def _run_main(self, parsed_args, parsed_globals):
 
 class S3TransferCommand(S3Command):
     def _run_main(self, parsed_args, parsed_globals):
-        super(S3TransferCommand, self)._run_main(parsed_args, parsed_globals)
+        super()._run_main(parsed_args, parsed_globals)
         register_feature_id('S3_TRANSFER')
         self._convert_path_args(parsed_args)
         params = self._get_params(parsed_args, parsed_globals, self._session)
@@ -1161,11 +1159,11 @@ class MbCommand(S3Command):
     ARG_TABLE = [{'name': 'path', 'positional_arg': True, 'synopsis': USAGE}]
 
     def _run_main(self, parsed_args, parsed_globals):
-        super(MbCommand, self)._run_main(parsed_args, parsed_globals)
+        super()._run_main(parsed_args, parsed_globals)
 
         if not parsed_args.path.startswith('s3://'):
             raise ParamValidationError(
-                "%s\nError: Invalid argument type" % self.USAGE
+                f"{self.USAGE}\nError: Invalid argument type"
             )
         bucket, _ = split_s3_bucket_key(parsed_args.path)
 
@@ -1182,11 +1180,11 @@ def _run_main(self, parsed_args, parsed_globals):
         # TODO: Consolidate how we handle return codes and errors
         try:
             self.client.create_bucket(**params)
-            uni_print("make_bucket: %s\n" % bucket)
+            uni_print(f"make_bucket: {bucket}\n")
             return 0
         except Exception as e:
             uni_print(
-                "make_bucket failed: %s %s\n" % (parsed_args.path, e),
+                f"make_bucket failed: {parsed_args.path} {e}\n",
                 sys.stderr,
             )
             return 1
@@ -1208,30 +1206,30 @@ class RbCommand(S3Command):
     ]
 
     def _run_main(self, parsed_args, parsed_globals):
-        super(RbCommand, self)._run_main(parsed_args, parsed_globals)
+        super()._run_main(parsed_args, parsed_globals)
 
         if not parsed_args.path.startswith('s3://'):
             raise ParamValidationError(
-                "%s\nError: Invalid argument type" % self.USAGE
+                f"{self.USAGE}\nError: Invalid argument type"
             )
         bucket, key = split_s3_bucket_key(parsed_args.path)
 
         if key:
             raise ParamValidationError(
                 'Please specify a valid bucket name only. '
-                'E.g. s3://%s' % bucket
+                f'E.g. s3://{bucket}'
             )
 
         if parsed_args.force:
             self._force(parsed_args.path, parsed_globals)
 
         try:
             self.client.delete_bucket(Bucket=bucket)
-            uni_print("remove_bucket: %s\n" % bucket)
+            uni_print(f"remove_bucket: {bucket}\n")
             return 0
         except Exception as e:
             uni_print(
-                "remove_bucket failed: %s %s\n" % (parsed_args.path, e),
+                f"remove_bucket failed: {parsed_args.path} {e}\n",
                 sys.stderr,
             )
             return 1
@@ -1637,7 +1635,7 @@ def _validate_path_args(self):
         if 'locals3' == params['paths_type'] and not params['is_stream']:
             if not os.path.exists(params['src']):
                 raise RuntimeError(
-                    'The user-provided path %s does not exist.' % params['src']
+                    f'The user-provided path {params['src']} does not exist.'
                 )
         # If the operation is downloading to a directory that does not exist,
         # create the directories so no warnings are thrown during the syncing
@@ -1764,7 +1762,7 @@ def check_path_type(self, paths):
             'locallocal': [],
         }
         paths_type = ''
-        usage = "usage: aws s3 %s %s" % (self.cmd, self.usage)
+        usage = f"usage: aws s3 {self.cmd} {self.usage}"
         for i in range(len(paths)):
             if paths[i].startswith('s3://'):
                 paths_type = paths_type + 's3'
@@ -1774,7 +1772,7 @@ def check_path_type(self, paths):
             self.parameters['paths_type'] = paths_type
         else:
             raise ParamValidationError(
-                "%s\nError: Invalid argument type" % usage
+                f"{usage}\nError: Invalid argument type"
             )
 
     def add_region(self, parsed_globals):
@@ -1814,14 +1812,14 @@ def _validate_sse_c_arg(self, sse_c_type='sse_c'):
         if self.parameters.get(sse_c_type):
             if not self.parameters.get(sse_c_key_type):
                 raise ParamValidationError(
-                    'If %s is specified, %s must be specified '
-                    'as well.' % (sse_c_type_param, sse_c_key_type_param)
+                    f'If {sse_c_type_param} is specified, {sse_c_key_type_param} must be specified '
+                    'as well.'
                 )
         if self.parameters.get(sse_c_key_type):
             if not self.parameters.get(sse_c_type):
                 raise ParamValidationError(
-                    'If %s is specified, %s must be specified '
-                    'as well.' % (sse_c_key_type_param, sse_c_type_param)
+                    f'If {sse_c_key_type_param} is specified, {sse_c_type_param} must be specified '
+                    'as well.'
                 )
 
     def _validate_sse_c_copy_source_for_paths(self):