Fix all pylint warnings

Author: Expertcoderz

pylintrc

@@ -1,7 +1,5 @@
 [MESSAGES CONTROL]
 
 disable =
-    consider-using-with,
     duplicate-code,
     missing-docstring,
-    redefined-outer-name,

userland/core/io.py

@@ -14,6 +14,7 @@ def perror(*errors: Any) -> None:
 @contextlib.contextmanager
 def safe_open(*args, **kwargs) -> Generator[IO | None]:
     try:
+        # pylint: disable=unspecified-encoding
         with open(*args, **kwargs) as io:
             yield io
     except OSError as e:

userland/core/users.py

@@ -25,6 +25,7 @@ def parse_owner_spec(self, owner_spec: str) -> tuple[int | None, int | None]:
 
         return uid, gid
 
+    # pylint: disable=inconsistent-return-statements
     def parse_user(self, user: str) -> int:
         """
         Accept a string representing a username or UID and return the UID.
@@ -38,6 +39,7 @@ def parse_user(self, user: str) -> int:
         except KeyError:
             self.error(f"invalid user: {user}")
 
+    # pylint: disable=inconsistent-return-statements
     def parse_group(self, group: str) -> int:
         """
         Accept a string representing a group name or GID and return the GID.

userland/utilities/cat.py

@@ -154,6 +154,7 @@ def python_userland_cat(opts, args: list[str]):
             streams.append(core.readlines_stdin_raw())
         else:
             try:
+                # pylint: disable=consider-using-with
                 streams.append(open(name, "rb"))
             except OSError as e:
                 failed = True

userland/utilities/chgrp.py

@@ -124,6 +124,18 @@
 )
 
 
+def get_new_group(opts, args: list[str]) -> tuple[int, str]:
+    if opts.reference:
+        gid = Path(opts.reference).stat(follow_symlinks=True).st_gid
+
+        return gid, core.group_display_name_from_id(gid)
+
+    parser.expect_nargs(args, (2,))
+    gname = args.pop(0)
+
+    return parser.parse_group(gname), gname
+
+
 @core.command(parser)
 def python_userland_chgrp(opts, args: list[str]):
     parser.expect_nargs(args, (1,))
@@ -134,22 +146,22 @@ def python_userland_chgrp(opts, args: list[str]):
     if opts.from_spec:
         from_uid, from_gid = parser.parse_owner_spec(opts.from_spec)
 
-    gid: int
-    gname: str | None = None
+    try:
+        gid, gname = get_new_group(opts, args)
+    except OSError as e:
+        core.perror(e)
+        return 1
 
-    if opts.reference:
-        try:
-            gid = Path(opts.reference).stat(follow_symlinks=True).st_gid
-        except OSError as e:
-            core.perror(e)
-            return 1
-    else:
-        parser.expect_nargs(args, (2,))
-        gname = args.pop(0)
+    failed = False
 
-        gid = parser.parse_group(gname)
+    def handle_error(err: Exception, level: int, msg: str) -> None:
+        nonlocal failed
+        failed = True
 
-    failed = False
+        if opts.verbosity:
+            core.perror(err)
+            if opts.verbosity > level:
+                print(msg, file=sys.stderr)
 
     for file in core.traverse_files(
         (
@@ -169,14 +181,7 @@ def python_userland_chgrp(opts, args: list[str]):
             prev_uid = stat.st_uid
             prev_gid = stat.st_gid
         except OSError as e:
-            failed = True
-            if opts.verbosity:
-                core.perror(e)
-                if opts.verbosity > 2:
-                    print(
-                        f"failed to change group of '{file}' to {gname or gid}",
-                        file=sys.stderr,
-                    )
+            handle_error(e, 2, f"failed to change group of '{file}' to {gname or gid}")
             continue
 
         prev_gname = core.group_display_name_from_id(prev_gid)
@@ -195,14 +200,7 @@ def python_userland_chgrp(opts, args: list[str]):
         try:
             shutil.chown(file, group=gid, follow_symlinks=opts.dereference)
         except OSError as e:
-            failed = True
-            if opts.verbosity:
-                core.perror(e)
-                if opts.verbosity > 2:
-                    print(
-                        f"failed to change group of '{file}' to {gname or gid}",
-                        file=sys.stderr,
-                    )
+            handle_error(e, 2, f"failed to change group of '{file}' to {gname or gid}")
             continue
 
         if prev_gid == gid:

userland/utilities/chown.py

@@ -125,51 +125,65 @@
 )
 
 
-@core.command(parser)
-def python_userland_chown(opts, args: list[str]):
-    parser.expect_nargs(args, (1,))
-
-    from_uid: int | None = None
-    from_gid: int | None = None
-
-    if opts.from_spec:
-        from_uid, from_gid = parser.parse_owner_spec(opts.from_spec)
-
-    chown_args = {"follow_symlinks": opts.dereference}
-
-    owner_spec: str
-
+def get_new_owner(opts, args: list[str], chown_args: dict) -> str | None:
     if opts.reference:
         try:
             ref_stat = Path(opts.reference).stat(follow_symlinks=True)
         except OSError as e:
             core.perror(e)
-            return 1
+            return None
 
         chown_args["user"] = ref_stat.st_uid
         chown_args["group"] = ref_stat.st_gid
 
-        owner_spec = (
+        return (
             core.user_display_name_from_id(ref_stat.st_uid)
             + ":"
             + core.group_display_name_from_id(ref_stat.st_gid)
         )
-    else:
-        parser.expect_nargs(args, (2,))
-        owner_spec = args.pop(0)
 
-        if not (owner_match := CHOWN_PATTERN.match(owner_spec)):
-            parser.error(f"invalid owner spec: {owner_spec}")
+    parser.expect_nargs(args, (2,))
+    owner_spec = args.pop(0)
 
-        chown_args["user"] = (
-            parser.parse_user(owner_match.group(1)) if owner_match.group(1) else None
-        )
-        chown_args["group"] = (
-            parser.parse_group(owner_match.group(3)) if owner_match.group(3) else None
-        )
+    if not (owner_match := CHOWN_PATTERN.match(owner_spec)):
+        parser.error(f"invalid owner spec: {owner_spec}")
+
+    chown_args["user"] = (
+        parser.parse_user(owner_match.group(1)) if owner_match.group(1) else None
+    )
+    chown_args["group"] = (
+        parser.parse_group(owner_match.group(3)) if owner_match.group(3) else None
+    )
+
+    return owner_spec
+
+
+@core.command(parser)
+def python_userland_chown(opts, args: list[str]):
+    parser.expect_nargs(args, (1,))
+
+    from_uid: int | None = None
+    from_gid: int | None = None
+
+    if opts.from_spec:
+        from_uid, from_gid = parser.parse_owner_spec(opts.from_spec)
+
+    chown_args = {"follow_symlinks": opts.dereference}
+
+    if not (owner_spec := get_new_owner(opts, args, chown_args)):
+        return 1
 
     failed = False
 
+    def handle_error(err: Exception, level: int, msg: str) -> None:
+        nonlocal failed
+        failed = True
+
+        if opts.verbosity:
+            core.perror(err)
+            if opts.verbosity > level:
+                print(msg, file=sys.stderr)
+
     for file in core.traverse_files(
         (tqdm(args, ascii=True, desc="Changing ownership") if opts.progress else args),
         recurse_mode=opts.recurse_mode if opts.recursive else None,
@@ -184,14 +198,9 @@ def python_userland_chown(opts, args: list[str]):
             prev_uid = stat.st_uid
             prev_gid = stat.st_gid
         except OSError as e:
-            failed = True
-            if opts.verbosity:
-                core.perror(e)
-                if opts.verbosity > 2:
-                    print(
-                        f"failed to change ownership of '{file}' to {owner_spec}",
-                        file=sys.stderr,
-                    )
+            handle_error(
+                e, 2, f"failed to change ownership of '{file}' to {owner_spec}"
+            )
             continue
 
         prev_uname = core.user_display_name_from_id(prev_uid)
@@ -207,14 +216,9 @@ def python_userland_chown(opts, args: list[str]):
         try:
             shutil.chown(file, **chown_args)
         except OSError as e:
-            failed = True
-            if opts.verbosity:
-                core.perror(e)
-                if opts.verbosity > 2:
-                    print(
-                        f"failed to change ownership of '{file}' to {owner_spec}",
-                        file=sys.stderr,
-                    )
+            handle_error(
+                e, 2, f"failed to change ownership of '{file}' to {owner_spec}"
+            )
             continue
 
         if prev_uid == chown_args["user"] or prev_gid == chown_args["group"]:

userland/utilities/env.py

@@ -49,12 +49,26 @@
 )
 
 
+def parse_env_args(args: list[str], env: dict[str, str], prog_args: list[str]) -> None:
+    parsing_decls = True
+
+    for arg in args:
+        if parsing_decls and (eq_pos := arg.find("=")) >= 0:
+            env[arg[:eq_pos]] = arg[eq_pos + 1 :]
+        else:
+            prog_args.append(arg)
+            parsing_decls = False
+
+
 @core.command(parser)
+# pylint: disable=inconsistent-return-statements
 def python_userland_env(opts, args: list[str]):
     if args and args[0] == "-":
         opts.ignore_environment = True
         del args[0]
 
+    env: dict[str, str]
+
     if opts.ignore_environment:
         env = {}
     elif opts.unset:
@@ -65,14 +79,7 @@ def python_userland_env(opts, args: list[str]):
         env = os.environ.copy()
 
     prog_args = []
-
-    parsing_decls = True
-    for arg in args:
-        if parsing_decls and (eq_pos := arg.find("=")) >= 0:
-            env[arg[:eq_pos]] = arg[eq_pos + 1 :]
-        else:
-            prog_args.append(arg)
-            parsing_decls = False
+    parse_env_args(args, env, prog_args)
 
     if opts.split_string:
         prog_args = shlex.split(opts.split_string) + prog_args
@@ -96,5 +103,3 @@ def python_userland_env(opts, args: list[str]):
     except OSError as e:
         core.perror(e)
         return 126 if isinstance(e, FileNotFoundError) else 127
-
-    return 0

userland/utilities/id.py

@@ -48,13 +48,13 @@ def python_userland_id(opts, args: list[str]):
     if opts.context:
         parser.error("--context (-Z) is not supported")
 
-    if (ugG := (opts.user, opts.group, opts.groups)).count(True) > 1:
+    if (ugg := (opts.user, opts.group, opts.groups)).count(True) > 1:
         parser.error("cannot print more than one of -ugG")
 
-    if opts.name or opts.real and not any(ugG):
+    if opts.name or opts.real and not any(ugg):
         parser.error("cannot print only names or real IDs in default format")
 
-    if opts.zero and not any(ugG):
+    if opts.zero and not any(ugg):
         parser.error("option --zero not permitted in default format")
 
     process_uid = os.getuid() if opts.real else os.geteuid()