Bump pyupgrade target to 3.10+

... according to the versions currently supported.

Change-Id: I9b2e38de3f7d19ee8d60e2225cbfdaffae96e58b
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>

.pre-commit-config.yaml

@@ -26,4 +26,4 @@ repos:
     rev: v3.20.0
     hooks:
       - id: pyupgrade
-        args: [--py3-only]
+        args: [--py310-plus]

doc/source/user/examples/usage_helper.py

@@ -81,7 +81,7 @@ def prepare():
     LOG.info("List of Oslo Logging configuration options and current values")
     LOG.info("=" * 80)
     for c in CONF:
-        LOG.info("{} = {}".format(c, CONF[c]))
+        LOG.info(f"{c} = {CONF[c]}")
     LOG.info("=" * 80)
 
     # Required setup based on configuration and domain

oslo_log/formatters.py

@@ -527,7 +527,7 @@ class ContextFormatter(logging.Formatter):
         formatted_lines = []
         for line in lines:
             pl = self.conf.logging_exception_prefix % record.__dict__
-            fl = '{}{}'.format(pl, line)
+            fl = f'{pl}{line}'
             formatted_lines.append(fl)
         return '\n'.join(formatted_lines)
 

oslo_log/log.py

@@ -85,7 +85,7 @@ def _get_log_file_path(conf, binary=None):
 
     if logdir:
         binary = binary or handlers._get_binary_name()
-        return '{}.log'.format(os.path.join(logdir, binary))
+        return f'{os.path.join(logdir, binary)}.log'
 
     return None
 

oslo_log/tests/unit/test_log.py

@@ -776,14 +776,14 @@ class ContextFormatterTestCase(LogTestBase):
         ctxt = _fake_context()
         message = 'bar'
         self.log.info(message, context=ctxt)
-        expected = 'HAS CONTEXT [{}]: {}\n'.format(ctxt.request_id, message)
+        expected = f'HAS CONTEXT [{ctxt.request_id}]: {message}\n'
         self.assertEqual(expected, self.stream.getvalue())
 
     def test_context_is_taken_from_tls_variable(self):
         ctxt = _fake_context()
         message = 'bar'
         self.log.info(message)
-        expected = "HAS CONTEXT [{}]: {}\n".format(ctxt.request_id, message)
+        expected = f"HAS CONTEXT [{ctxt.request_id}]: {message}\n"
         self.assertEqual(expected, self.stream.getvalue())
 
     def test_contextual_information_is_imparted_to_3rd_party_log_records(self):
@@ -793,7 +793,7 @@ class ContextFormatterTestCase(LogTestBase):
         message = 'emulate logging within sqlalchemy'
         sa_log.info(message)
 
-        expected = ('HAS CONTEXT [{}]: {}\n'.format(ctxt.request_id, message))
+        expected = (f'HAS CONTEXT [{ctxt.request_id}]: {message}\n')
         self.assertEqual(expected, self.stream.getvalue())
 
     def test_message_logging_3rd_party_log_records(self):
@@ -855,7 +855,7 @@ class ContextFormatterTestCase(LogTestBase):
                 raise ignore('test_exception_logging')
             except ignore as e:
                 self.log.warning(message, context=ctxt)
-                expected = '{}: {}'.format(e.__class__.__name__, e)
+                expected = f'{e.__class__.__name__}: {e}'
             self.assertNotIn(expected, self.stream.getvalue())
 
     def test_exception_logging_format_string(self):
@@ -1090,8 +1090,8 @@ class FancyRecordTestCase(LogTestBase):
         warncolor = handlers.ColorHandler.LEVEL_COLORS[logging.WARN]
         info_msg = 'info'
         warn_msg = 'warn'
-        infoexpected = "{} {} {}".format(infocolor, keyed_log_string, info_msg)
-        warnexpected = "{} {} {}".format(warncolor, keyed_log_string, warn_msg)
+        infoexpected = f"{infocolor} {keyed_log_string} {info_msg}"
+        warnexpected = f"{warncolor} {keyed_log_string} {warn_msg}"
 
         self.colorlog.info(info_msg, context=ctxt)
         self.assertIn(infoexpected, self.stream.getvalue())
@@ -1241,9 +1241,9 @@ class DomainTestCase(LogTestBase):
 
     def _validate_keys(self, ctxt, keyed_log_string):
         info_message = 'info'
-        infoexpected = "{} {}\n".format(keyed_log_string, info_message)
+        infoexpected = f"{keyed_log_string} {info_message}\n"
         warn_message = 'warn'
-        warnexpected = "{} {}\n".format(keyed_log_string, warn_message)
+        warnexpected = f"{keyed_log_string} {warn_message}\n"
 
         self.mylog.info(info_message, context=ctxt)
         self.assertEqual(infoexpected, self.stream.getvalue())
@@ -1424,9 +1424,9 @@ class MutateTestCase(BaseTestCase):
                           "keys=%s" % skeys])
             for key in keys:
                 lines.extend(["",
-                              "[{}_{}]".format(section[:-1], key)])
+                              f"[{section[:-1]}_{key}]"])
                 item = items[key]
-                lines.extend("{}={}".format(k, item[k]) for k in sorted(item))
+                lines.extend(f"{k}={item[k]}" for k in sorted(item))
                 if section == 'handlers':
                     if 'args' not in item:
                         lines.append("args=()")
@@ -1438,7 +1438,7 @@ class MutateTestCase(BaseTestCase):
         root = data.get('root', {})
         if root:
             lines.extend(["[logger_root]"])
-            lines.extend("{}={}".format(k, root[k]) for k in sorted(root))
+            lines.extend(f"{k}={root[k]}" for k in sorted(root))
             if 'handlers' not in root:
                 lines.append("handlers=")
         return "\n".join(lines)