various linter fixes

Author: mastercoms

pbpy/pbengine.py

@@ -1,12 +1,7 @@
 import json
-
 from pathlib import Path
 
-from pbpy import pbconfig
-from pbpy import pbtools
-from pbpy import pblog
-from pbpy import pbgit
-from pbpy import pbuac
+from pbpy import pbgit, pbtools
 
 
 def generate_module_changes(old_commitish, new_commitish):

pbpy/pbgit.py

@@ -157,7 +157,7 @@ def get_locked(key="ours", include_new=True):
     if proc.returncode:
         return None
     locked_objects = json.loads(proc.stdout)[key]
-    locked = set([l.get("path") for l in locked_objects])
+    locked = set([lock.get("path") for lock in locked_objects])
     # also check untracked and added files
     if key == "ours" and include_new:
         proc = pbtools.run_with_combined_output(

pbpy/pbsteamcmd.py

@@ -1,13 +1,12 @@
 import os
 import re
 import shutil
-import time
 import traceback
 import urllib.request
 from pathlib import Path
 
 import gevent
-import steam.protobufs.steammessages_partnerapps_pb2  # don't remove
+import steam.protobufs.steammessages_partnerapps_pb2  # noqa: F401 - don't remove
 from steam.client import SteamClient
 
 from pbpy import pbconfig, pbinfo, pblog, pbtools

pbpy/pbtools.py

@@ -285,7 +285,7 @@ def compare_hash_single(compared_file_path, hash_json_file_path):
     dict_search_string = f"{compared_file_path}"
     hash_dict = get_dict_from_json(hash_json_file_path)
 
-    if hash_dict is None or not (dict_search_string in hash_dict):
+    if hash_dict is None or dict_search_string not in hash_dict:
         pblog.error(f"Key {dict_search_string} not found in {hash_json_file_path}")
         return False
 
@@ -720,8 +720,7 @@ def res_log(log):
             chunked_files = chunks(changed_files, batch_size)
 
             # make index.lock to block LFS from updating index
-            with open(".git/index.lock", "w") as f:
-                pass
+            Path(".git/index.lock").touch()
 
             # Update index without FS monitor
             run(
@@ -862,7 +861,7 @@ def res_log(log):
     ):
         if should_attempt_auto_resolve():
             pblog.error("Untracked files would be overwritten. Retrying...")
-            files = [l.strip() for l in out.splitlines()[1:]]
+            files = [line.strip() for line in out.splitlines()[1:]]
             run_with_combined_output(
                 [pbgit.get_git_executable(), "add", "-A", "--", *files]
             )

pbpy/pbuac.py

@@ -70,9 +70,12 @@ def runAsAdmin(cmdLine=None, wait=True):
     if os.name != "nt":
         raise RuntimeError("This function is only implemented on Windows.")
 
-    import win32con, win32event, win32process, pywintypes
-    from win32com.shell.shell import ShellExecuteEx
+    import pywintypes
+    import win32con
+    import win32event
+    import win32process
     from win32com.shell import shellcon
+    from win32com.shell.shell import ShellExecuteEx
 
     if not isinstance(cmdLine, (tuple, list)):
         raise ValueError("cmdLine is not a sequence.")

pbpy/pbunreal.py

@@ -886,7 +886,6 @@ def download_engine(bundle_name: str, download_symbols: bool):
         # create install dir if doesn't exist
         os.makedirs(root, exist_ok=True)
 
-        root_path = Path(root)
         base_path = get_engine_base_path()
 
         if not legacy_archives:
@@ -1558,8 +1557,8 @@ def inspect_source(all=False):
 def clean_binaries_folder(clean_pdbs):
     base_path = Path(".")
     for binaries_path in binaries_paths:
-        for glob in clean_binaries_globs:
-            for file in base_path.glob(f"{binaries_path}/{get_platform_name()}/{glob}"):
+        for binary_glob in clean_binaries_globs:
+            for file in base_path.glob(f"{binaries_path}/{get_platform_name()}/{binary_glob}"):
                 file.unlink()
 
     if clean_pdbs:

pbsync/__main__.py

@@ -3,9 +3,9 @@
 import multiprocessing
 import os
 import sys
+from ast import literal_eval
 from functools import partial
 from pathlib import Path
-from ast import literal_eval
 
 from pbpy import (
     pbbutler,
@@ -285,7 +285,7 @@ def main(argv):
     )
     parser.add_argument(
         "--uproject",
-        help=f"Multi-project folders only: project name to choose from. If not provided, it will prompt the user for one, or in CI environments, use the first one found.",
+        help="Multi-project folders only: project name to choose from. If not provided, it will prompt the user for one, or in CI environments, use the first one found.",
         default="",
     )
 
@@ -298,7 +298,7 @@ def main(argv):
         error_state(hush=True, term=True)
         return
 
-    if not (args.debugpath is None):
+    if args.debugpath is not None:
         # Work on provided debug path
         os.chdir(str(args.debugpath))
 
@@ -374,7 +374,7 @@ def pbsync_config_parser_func(root):
                 # Attempt to parse literal as a python literal if its type does not match the type of the default value.
                 # fixes bugs where config.get(key) is ran on a key which is expected to be boolean
                 # if the key is set in config, its boolean implicit cast will always be true, since strings 'False' and 'True' both evaluate to True when converting to bool.
-                if is_single and (default is not None) and type(el) != type(default):
+                if is_single and (default is not None) and type(el) is not type(default):
                     try:
                         el = literal_eval(el) # not as crazy as eval, only parses literals (https://docs.python.org/3/library/ast.html#ast.literal_eval)
                     except (TypeError, ValueError) as e:
@@ -486,17 +486,17 @@ def pbsync_config_parser_func(root):
         error_state(hush=True)
 
     # Parse args
-    if not (args.printversion is None):
+    if args.printversion is not None:
         printversion_handler(args.printversion)
-    if not (args.clean is None):
+    if args.clean is not None:
         clean_handler(args.clean)
-    if not (args.sync is None):
+    if args.sync is not None:
         sync_handler(args.sync)
-    if not (args.autoversion is None):
+    if args.autoversion is not None:
         autoversion_handler(args.autoversion)
-    if not (args.build is None):
+    if args.build is not None:
         build_handler(args.build)
-    if not (args.publish is None):
+    if args.publish is not None:
         publish_handler(args.publish)
 
     pbconfig.shutdown()

pbsync/actions.py

@@ -1,7 +1,6 @@
 import os
 import sys
 import threading
-from pathlib import Path
 
 from pbpy import pbconfig, pbgh, pbgit, pblog, pbtools, pbunreal
 from pbsync import prereqs
@@ -343,7 +342,7 @@ def launch_project():
 
                 if not launched_editor:
                     pblog.warning(
-                        f"CliqueSync failed to find a valid file association to launch the editor, and will attempt to launch the editor directly as a workaround."
+                        "CliqueSync failed to find a valid file association to launch the editor, and will attempt to launch the editor directly as a workaround."
                     )
                     pbtools.run_non_blocking_ex([pbunreal.get_editor_path(), path])
                     pblog.warning(

pbsync/prereqs.py

@@ -325,7 +325,7 @@ def install(self) -> bool:
             repo="microsoft/git",
             asset_pattern=PlatformSpecificValue(
                 platform_values={
-                    "win32": f"Git-*-64-bit.exe",
+                    "win32": "Git-*-64-bit.exe",
                     "darwin": "git-*-universal.pkg",
                 },
             ),
@@ -340,7 +340,7 @@ def install(self) -> bool:
             }
         )
 
-        ok = linstall() == True
+        ok = linstall() is True
         if ok:
             if os.name == "nt":
                 # Reconfigure GCM path
@@ -462,7 +462,7 @@ def install(self) -> bool:
                 "linux": PosixPackageInstaller(["git-lfs"]).install,
             }
         )
-        ok = linstall() == True
+        ok = linstall() is True
         if ok:
             # Configure LFS hooks for the user
             current_drive = Path().resolve()
@@ -592,7 +592,7 @@ def install(self) -> bool:
             or detected == pbgit.missing_version
             or (isinstance(detected, str) and detected.startswith("diff"))
         )
-        ok = linstall() == True if need_install else True
+        ok = linstall() is True if need_install else True
 
         # (Re)configure GCM and verify
         gcm_bin = pbgit.get_gcm_executable()