format code using ruff format, move to F-strings

Author: mr-mixas

nested_diff/__init__.py

@@ -35,15 +35,14 @@
     nested_diff.handlers.TupleHandler(),
     nested_diff.handlers.SetHandler(),
     nested_diff.handlers.FrozenSetHandler(),
-
     nested_diff.handlers.IntHandler(),
     nested_diff.handlers.FloatHandler(),
     nested_diff.handlers.StrHandler(),
     nested_diff.handlers.BytesHandler(),
 )
 
 
-class Differ():
+class Differ:
     """
     Compute recursive diff for two passed objects.
 
@@ -102,8 +101,17 @@ class Differ():
 
     default_differ = DEFAULT_HANDLER.diff
 
-    def __init__(self, A=True, N=True, O=True, R=True, U=True,  # noqa: E501 E741 N803
-                 trimR=False, dumper=None, handlers=None):
+    def __init__(
+        self,
+        A=True,  # noqa: N803
+        N=True,
+        O=True,  # noqa: E741
+        R=True,
+        U=True,
+        trimR=False,
+        dumper=None,
+        handlers=None,
+    ):
         """Initialize Differ.
 
         Args:
@@ -167,7 +175,7 @@ def set_handler(self, handler):
         self._differs[handler.handled_type] = handler.diff
 
 
-class Patcher():
+class Patcher:
     """Patch objects using nested diff."""
 
     default_patcher = DEFAULT_HANDLER.patch
@@ -211,16 +219,18 @@ def patch(self, target, ndiff):
                 try:
                     patcher = self._patchers_by_ext[extension_id]
                 except KeyError:
-                    raise ValueError('unsupported extension: '
-                                     + extension_id) from None
+                    raise ValueError(
+                        f'unsupported extension: {extension_id}',
+                    ) from None
             except KeyError:
                 cls = ndiff['D'].__class__
 
                 try:
                     patcher = self._patchers_by_cls[cls]
                 except KeyError:
-                    raise ValueError('unsupported patch type: '
-                                     + cls.__name__) from None
+                    raise ValueError(
+                        f'unsupported patch type: {cls.__name__}',
+                    ) from None
 
             return patcher(self, target, ndiff)
 
@@ -239,7 +249,7 @@ def set_handler(self, handler):
             self._patchers_by_ext[handler.extension_id] = handler.patch
 
 
-class Iterator():
+class Iterator:
     """Nested diff iterator."""
 
     default_iterator = DEFAULT_HANDLER.iterate_diff
@@ -267,8 +277,9 @@ def _get_iterator(self, ndiff):
             try:
                 iterator = self._iters_by_ext[extension_id]
             except KeyError:
-                raise ValueError('unsupported extension: '
-                                 + extension_id) from None
+                raise ValueError(
+                    f'unsupported extension: {extension_id}',
+                ) from None
         except KeyError:
             try:
                 iterator = self._iters_by_cls[ndiff['D'].__class__]

nested_diff/cli.py

@@ -23,7 +23,7 @@
 import nested_diff
 
 
-class App():
+class App:
     """Base class for command line tools."""
 
     default_ifmt = 'auto'
@@ -52,6 +52,7 @@ def _decode_fmt_opts(opts):
             return {}
 
         import json
+
         return json.loads(opts)
 
     @classmethod
@@ -66,7 +67,7 @@ def dumper(self):  # noqa D102
         except AttributeError:
             self.__dumper = self.get_dumper(
                 self.args.ofmt,
-                **self._decode_fmt_opts(self.args.ofmt_opts)  # noqa C815
+                **self._decode_fmt_opts(self.args.ofmt_opts),
             )
 
             return self.__dumper
@@ -87,7 +88,7 @@ def get_optional_args_parser(self):
         parser.add_argument(
             '--version',
             action='version',
-            version='%(prog)s {}'.format(self.version),
+            version=f'%(prog)s {self.version}',
             help='print version and exit',
         )
 
@@ -152,7 +153,7 @@ def get_dumper(fmt, **kwargs):
         if fmt == 'toml':
             return TomlDumper(**kwargs)
 
-        raise RuntimeError('Unsupported output format: ' + fmt)
+        raise RuntimeError(f'Unsupported output format: {fmt}')
 
     @staticmethod
     def guess_fmt(fp, default, ignore_fps=(sys.stdin, sys.stdout, sys.stderr)):
@@ -191,7 +192,7 @@ def get_loader(fmt, **kwargs):
         if fmt == 'toml':
             return TomlLoader(**kwargs)
 
-        raise RuntimeError('Unsupported input format: ' + fmt)
+        raise RuntimeError(f'Unsupported input format: {fmt}')
 
     def load(self, file_):
         """Load data from file using apropriate loader.
@@ -220,6 +221,7 @@ def override_excepthook():
         in files).
 
         """
+
         def overrided(*args, **kwargs):
             sys.__excepthook__(*args, **kwargs)  # do all the same
             raise SystemExit(127)  # but change exit code
@@ -236,7 +238,7 @@ def run(self):
         raise NotImplementedError
 
 
-class Dumper():
+class Dumper:
     """Base class for data dumpers."""
 
     tty_final_new_line = False
@@ -285,7 +287,7 @@ def dump(self, file_, data):
         file_.flush()
 
 
-class Loader():
+class Loader:
     """Base class for data loaders."""
 
     def decode(self, data):  # noqa U100
@@ -333,6 +335,7 @@ def __init__(self, **kwargs):
         super().__init__()
 
         import json
+
         self.encoder = json.JSONEncoder(**self.get_opts(kwargs))
 
     def encode(self, data):
@@ -370,6 +373,7 @@ def __init__(self, **kwargs):
         super().__init__()
 
         import json
+
         self.decoder = json.JSONDecoder(**self.get_opts(kwargs))
 
     def decode(self, data):
@@ -391,6 +395,7 @@ def __init__(self, **kwargs):
 
         import configparser
         import io
+
         self.encoder = configparser.ConfigParser(**self.get_opts(kwargs))
         self.stringio = io.StringIO()
 
@@ -415,6 +420,7 @@ def __init__(self, **kwargs):
         super().__init__()
 
         import configparser
+
         self.decoder = configparser.ConfigParser(**kwargs)
 
     def decode(self, data):
@@ -441,6 +447,7 @@ def __init__(self):
         super().__init__()
 
         import tomli_w
+
         self.codec = tomli_w
 
     def encode(self, data):
@@ -480,6 +487,7 @@ def __init__(self, **kwargs):
         super().__init__()
 
         import yaml
+
         try:
             from yaml import CSafeDumper as ImportedYamlDumper
         except ImportError:
@@ -532,6 +540,7 @@ def __init__(self, **kwargs):
         super().__init__()
 
         import yaml
+
         try:
             from yaml import CSafeLoader as YamlLoader
         except ImportError:

nested_diff/diff_tool.py

@@ -45,7 +45,7 @@ def diff(self, a, b, **kwargs):
         diff_opts = {
             'A': self.args.A,
             'N': self.args.N,
-            'O': self.args.O,  # noqa: E741
+            'O': self.args.O,
             'R': self.args.R,
             'U': self.args.U,
         }
@@ -60,8 +60,9 @@ def diff(self, a, b, **kwargs):
         differ = nested_diff.Differ(**diff_opts)
 
         if self.args.text_ctx >= 0:
-            differ.set_handler(nested_diff.handlers.TextHandler(
-                context=self.args.text_ctx))
+            differ.set_handler(
+                nested_diff.handlers.TextHandler(context=self.args.text_ctx),
+            )
 
         return differ.diff(a, b)
 
@@ -85,8 +86,8 @@ def generate_diffs(self):
             if self.args.show:
                 if headers_enabled:
                     header = self.dumper.get_diff_header(
-                        '/dev/null (' + file_.name + ')',
-                        '/dev/null (' + file_.name + ')',
+                        f'/dev/null ({file_.name})',
+                        f'/dev/null ({file_.name})',
                     )
                 diff = self.load(file_)
                 equal = not diff or 'U' in diff
@@ -114,7 +115,7 @@ def get_optional_args_parser(self):
             '--show',
             action='store_true',
             help="don't diff arguments, just format and show them; nested "
-                 'diffs expected on input',
+            'diffs expected for input',
         )
 
         parser.add_argument(
@@ -123,8 +124,7 @@ def get_optional_args_parser(self):
             metavar='NUM',
             type=int,
             help='amount of context lines for text (multiline strings) diffs; '
-                 'negative value will disable such diffs, default is '
-                 '"%(default)s"',
+            'negative value will disable such diffs, default is "%(default)s"',
         )
 
         parser.add_argument(
@@ -136,7 +136,8 @@ def get_optional_args_parser(self):
         )
 
         parser.add_argument(
-            '-q', '--quiet',
+            '-q',
+            '--quiet',
             action='store_true',
             help="don't show diff, exit code is the only difference indicator",
         )
@@ -146,21 +147,45 @@ def get_optional_args_parser(self):
             choices=('repr', 'none', 'json', 'yaml'),
             default='repr',
             help='values format; "none" means no values printed, "repr" is a '
-                 'python representation of the object, rest are themselves; '
-                 'default is "%(default)s"',
+            'python representation of the object, rest are themselves; default'
+            ' is "%(default)s"',
         )
 
-        parser.add_argument('-A', type=int, choices=(0, 1), default=1,
-                            help='show added items; enabled by default')
-        parser.add_argument('-N', type=int, choices=(0, 1), default=1,
-                            help="show item's new values; enabled by default")
-        parser.add_argument('-O', type=int, choices=(0, 1), default=1,
-                            help="show item's old values; enabled by default")
-        parser.add_argument('-R', choices=('0', '1', 'trim'), default=1,
-                            help='Show removed items; enabled (1) by default. '
-                            'Value will be replaced by null when "trim" used')
-        parser.add_argument('-U', type=int, choices=(0, 1), default=0,
-                            help='show unchanged items; disabled by default')
+        parser.add_argument(
+            '-A',
+            choices=(0, 1),
+            default=1,
+            help='show added items; enabled by default',
+            type=int,
+        )
+        parser.add_argument(
+            '-N',
+            choices=(0, 1),
+            default=1,
+            help="show item's new values; enabled by default",
+            type=int,
+        )
+        parser.add_argument(
+            '-O',
+            choices=(0, 1),
+            default=1,
+            help="show item's old values; enabled by default",
+            type=int,
+        )
+        parser.add_argument(
+            '-R',
+            choices=('0', '1', 'trim'),
+            default=1,
+            help='Show removed items; enabled (1) by default. '
+            'Value will be replaced by null when "trim" used',
+        )
+        parser.add_argument(
+            '-U',
+            choices=(0, 1),
+            default=0,
+            help='show unchanged items; disabled by default',
+            type=int,
+        )
 
         return parser
 
@@ -233,7 +258,7 @@ def __init__(
         lang='en',
         title='Nested diff',
         values='repr',
-        **kwargs  # noqa C816
+        **kwargs,
     ):
         """Initialize dumper.
 
@@ -304,7 +329,8 @@ def __init__(self, *args, **kwargs):
                     self.__val_encoder = nested_diff.cli.JsonDumper(indent=2)
                 elif values == 'yaml':
                     self.__val_encoder = nested_diff.cli.YamlDumper(
-                        explicit_start=False)
+                        explicit_start=False,
+                    )
 
                 self.generate_value = self.generate_multiline_value