Adds pyupgrade in pre-commit

Author: gnikit

.pre-commit-config.yaml

@@ -8,11 +8,15 @@ repos:
     -   id: end-of-file-fixer
     -   id: check-yaml
     -   id: check-added-large-files
--   repo: https://github.com/psf/black
-    rev: 22.3.0
-    hooks:
-    -   id: black
 -   repo: https://gitlab.com/pycqa/flake8
     rev: 4.0.1
     hooks:
     - id: flake8
+-   repo: https://github.com/asottile/pyupgrade
+    rev: v2.32.1
+    hooks:
+    -   id: pyupgrade
+-   repo: https://github.com/psf/black
+    rev: 22.3.0
+    hooks:
+    -   id: black

fortls/__init__.py

@@ -86,18 +86,18 @@ def debug_server_general(args, settings):
                 "Specified 'debug_rootpath' does not exist or is not a directory"
             )
         print('\nTesting "initialize" request:')
-        print('  Root = "{0}"'.format(args.debug_rootpath))
+        print('  Root = "{}"'.format(args.debug_rootpath))
         s.serve_initialize({"params": {"rootPath": args.debug_rootpath}})
         if len(s.post_messages) == 0:
             print("  Successful!")
         else:
             print("  Successful with errors:")
             for message in s.post_messages:
-                print("    {0}".format(message[1]))
+                print("    {}".format(message[1]))
         # Print module directories
         print("\n  Source directories:")
         for source_dir in s.source_dirs:
-            print("    {0}".format(source_dir))
+            print("    {}".format(source_dir))
     #
     if args.debug_diagnostics:
         print('\nTesting "textDocument/publishDiagnostics" notification:')
@@ -117,7 +117,7 @@ def debug_server_general(args, settings):
                     sline = diag["range"]["start"]["line"]
                     message = diag["message"]
                     sev = sev_map[diag["severity"] - 1]
-                    print('  {0:5d}:{1}  "{2}"'.format(sline, sev, message))
+                    print('  {:5d}:{}  "{}"'.format(sline, sev, message))
     #
     if args.debug_symbols:
         print('\nTesting "textDocument/documentSymbol" request:')
@@ -192,7 +192,7 @@ def debug_server_general(args, settings):
             else:
                 for obj in completion_results:
                     print(
-                        "    {0}: {1} -> {2}".format(
+                        "    {}: {} -> {}".format(
                             obj["kind"], obj["label"], obj["detail"]
                         )
                     )
@@ -220,11 +220,11 @@ def debug_server_general(args, settings):
                 print(json.dumps(signature_results, indent=2))
             else:
                 active_param = signature_results.get("activeParameter", 0)
-                print("    Active param = {0}".format(active_param))
+                print("    Active param = {}".format(active_param))
                 active_signature = signature_results.get("activeSignature", 0)
-                print("    Active sig   = {0}".format(active_signature))
+                print("    Active sig   = {}".format(active_signature))
                 for i, signature in enumerate(signature_results["signatures"]):
-                    print("    {0}".format(signature["label"]))
+                    print("    {}".format(signature["label"]))
                     for j, obj in enumerate(signature["parameters"]):
                         if (i == active_signature) and (j == active_param):
                             active_mark = "*"
@@ -278,14 +278,14 @@ def debug_server_general(args, settings):
             if args.debug_full_result:
                 print(json.dumps(definition_results, indent=2))
             else:
-                print('    URI  = "{0}"'.format(definition_results["uri"]))
+                print('    URI  = "{}"'.format(definition_results["uri"]))
                 print(
-                    "    Line = {0}".format(
+                    "    Line = {}".format(
                         definition_results["range"]["start"]["line"] + 1
                     )
                 )
                 print(
-                    "    Char = {0}".format(
+                    "    Char = {}".format(
                         definition_results["range"]["start"]["character"] + 1
                     )
                 )
@@ -345,7 +345,7 @@ def debug_server_general(args, settings):
                 print("=======")
                 for result in ref_results:
                     print(
-                        "  {0}  ({1}, {2})".format(
+                        "  {}  ({}, {})".format(
                             result["uri"],
                             result["range"]["start"]["line"] + 1,
                             result["range"]["start"]["character"] + 1,
@@ -379,7 +379,7 @@ def debug_server_general(args, settings):
                 print("=======")
                 for uri, result in ref_results["changes"].items():
                     path = path_from_uri(uri)
-                    print('File: "{0}"'.format(path))
+                    print('File: "{}"'.format(path))
                     file_obj = s.workspace.get(path)
                     if file_obj is not None:
                         file_contents = file_obj.contents_split
@@ -388,22 +388,22 @@ def debug_server_general(args, settings):
                             end_line = change["range"]["end"]["line"]
                             start_col = change["range"]["start"]["character"]
                             end_col = change["range"]["end"]["character"]
-                            print("  {0}, {1}".format(start_line + 1, end_line + 1))
+                            print("  {}, {}".format(start_line + 1, end_line + 1))
                             new_contents = []
                             for i in range(start_line, end_line + 1):
                                 line = file_contents[i]
-                                print("  - {0}".format(line))
+                                print("  - {}".format(line))
                                 if i == start_line:
                                     new_contents.append(
                                         line[:start_col] + change["newText"]
                                     )
                                 if i == end_line:
                                     new_contents[-1] += line[end_col:]
                             for line in new_contents:
-                                print("  + {0}".format(line))
+                                print("  + {}".format(line))
                             print()
                     else:
-                        print('Unknown file: "{0}"'.format(path))
+                        print('Unknown file: "{}"'.format(path))
                 print("=======")
     #
     if args.debug_actions:
@@ -434,12 +434,10 @@ def debug_server_general(args, settings):
         else:
             for result in action_results:
                 print(
-                    "Kind = '{0}', Title = '{1}'".format(
-                        result["kind"], result["title"]
-                    )
+                    "Kind = '{}', Title = '{}'".format(result["kind"], result["title"])
                 )
                 for editUri, editChange in result["edit"]["changes"].items():
-                    print("\nChange: URI = '{0}'".format(editUri))
+                    print("\nChange: URI = '{}'".format(editUri))
                     pp.pprint(editChange)
                 print()
     tmpout.close()
@@ -485,7 +483,7 @@ def debug_server_parser(args):
                 print(f"Error while parsing '{args.config}' settings file")
     #
     print("\nTesting parser")
-    print('  File = "{0}"'.format(args.debug_filepath))
+    print('  File = "{}"'.format(args.debug_filepath))
     file_obj = fortran_file(args.debug_filepath, pp_suffixes)
     err_str, _ = file_obj.load_from_disk()
     if err_str:
@@ -495,11 +493,11 @@ def debug_server_parser(args):
     file_ast = file_obj.parse(debug=True, pp_defs=pp_defs, include_dirs=include_dirs)
     print("\n=========\nObject Tree\n=========\n")
     for obj in file_ast.get_scopes():
-        print("{0}: {1}".format(obj.get_type(), obj.FQSN))
+        print("{}: {}".format(obj.get_type(), obj.FQSN))
         print_children(obj)
     print("\n=========\nExportable Objects\n=========\n")
     for _, obj in file_ast.global_dict.items():
-        print("{0}: {1}".format(obj.get_type(), obj.FQSN))
+        print("{}: {}".format(obj.get_type(), obj.FQSN))
 
 
 def check_request_params(args, loc_needed=True):
@@ -508,17 +506,17 @@ def check_request_params(args, loc_needed=True):
     file_exists = os.path.isfile(args.debug_filepath)
     if file_exists is False:
         error_exit("Specified 'debug_filepath' does not exist")
-    print('  File = "{0}"'.format(args.debug_filepath))
+    print('  File = "{}"'.format(args.debug_filepath))
     if loc_needed:
         if args.debug_line is None:
             error_exit("'debug_line' not specified for debug request")
-        print("  Line = {0}".format(args.debug_line))
+        print("  Line = {}".format(args.debug_line))
         if args.debug_char is None:
             error_exit("'debug_char' not specified for debug request")
-        print("  Char = {0}\n".format(args.debug_char))
+        print("  Char = {}\n".format(args.debug_char))
 
 
 def print_children(obj, indent=""):
     for child in obj.get_children():
-        print("  {0}{1}: {2}".format(indent, child.get_type(), child.FQSN))
+        print("  {}{}: {}".format(indent, child.get_type(), child.FQSN))
         print_children(child, indent + "  ")

fortls/helper_functions.py

@@ -107,10 +107,10 @@ def strip_strings(in_line: str, maintain_len: bool = False) -> str:
     """
 
     def repl_sq(m):
-        return "'{0}'".format(" " * (len(m.group()) - 2))
+        return "'{}'".format(" " * (len(m.group()) - 2))
 
     def repl_dq(m):
-        return '"{0}"'.format(" " * (len(m.group()) - 2))
+        return '"{}"'.format(" " * (len(m.group()) - 2))
 
     if maintain_len:
         out_line = FRegex.SQ_STRING.sub(repl_sq, in_line)

fortls/objects.py

@@ -1666,7 +1666,7 @@ def get_hover(self, long=False, include_doc=True, drop_arg=-1):
         if self.is_parameter() and self.param_val:
             hover_str += f" :: {self.name} = {self.param_val}"
         if include_doc and (doc_str is not None):
-            hover_str += "\n {0}".format("\n ".join(doc_str.splitlines()))
+            hover_str += "\n {}".format("\n ".join(doc_str.splitlines()))
         return hover_str, True
 
     def get_keywords(self):

test/test_interface.py

@@ -28,10 +28,10 @@ def test_command_line_file_parsing_options():
         "--source_dirs tmp ./local /usr/include/** --incl_suffixes .FF .fpc .h f20"
         " --excl_suffixes _tmp.f90 _h5hut_tests.F90 --excl_paths exclude tests".split()
     )
-    assert args.source_dirs == set(["tmp", "./local", "/usr/include/**"])
+    assert args.source_dirs == {"tmp", "./local", "/usr/include/**"}
     assert args.incl_suffixes == [".FF", ".fpc", ".h", "f20"]
-    assert args.excl_suffixes == set(["_tmp.f90", "_h5hut_tests.F90"])
-    assert args.excl_paths == set(["exclude", "tests"])
+    assert args.excl_suffixes == {"_tmp.f90", "_h5hut_tests.F90"}
+    assert args.excl_paths == {"exclude", "tests"}
 
 
 def test_command_line_autocomplete_options():
@@ -69,7 +69,7 @@ def test_command_line_preprocessor_options():
         ' {"HAVE_PETSC":"","HAVE_ZOLTAN":"","Mat":"type(tMat)"}'.split()
     )
     assert args.pp_suffixes == [".h", ".fh"]
-    assert args.include_dirs == set(["/usr/include/**", "./local/incl"])
+    assert args.include_dirs == {"/usr/include/**", "./local/incl"}
     assert args.pp_defs == {"HAVE_PETSC": "", "HAVE_ZOLTAN": "", "Mat": "type(tMat)"}
 
 
@@ -109,12 +109,10 @@ def test_config_file_general_options():
 def test_config_file_dir_parsing_options():
     server, r = unittest_server_init()
     # File parsing
-    assert server.source_dirs == set(
-        [f'{r/"subdir"}', f'{r/"pp"}', f'{r/"pp"/"include"}']
-    )
+    assert server.source_dirs == {f'{r/"subdir"}', f'{r/"pp"}', f'{r/"pp"/"include"}'}
     assert server.incl_suffixes == [".FF", ".fpc", ".h", "f20"]
-    assert server.excl_suffixes == set(["_tmp.f90", "_h5hut_tests.F90"])
-    assert server.excl_paths == set([f'{r/"excldir"}', f'{r/"hover"}'])
+    assert server.excl_suffixes == {"_tmp.f90", "_h5hut_tests.F90"}
+    assert server.excl_paths == {f'{r/"excldir"}', f'{r/"hover"}'}
 
 
 def test_config_file_autocomplete_options():
@@ -146,7 +144,7 @@ def test_config_file_preprocessor_options():
     server, root = unittest_server_init()
     # Preprocessor options
     assert server.pp_suffixes == [".h", ".fh"]
-    assert server.include_dirs == set([f'{root/"include"}'])
+    assert server.include_dirs == {f'{root/"include"}'}
     assert server.pp_defs == {
         "HAVE_PETSC": "",
         "HAVE_ZOLTAN": "",