Merge branch 'johan/ruff' into python

.pylintrc

@@ -1,21 +1,4 @@
+# Disable all categories since we're running ruff instead, but VSCode insists on
+# invoking pylint all the time
 [MESSAGES CONTROL]
-disable=
-    consider-using-max-builtin,
-    disallowed-name,
-    fixme,
-    global-statement,
-    invalid-name,
-    line-too-long,
-    missing-class-docstring,
-    missing-function-docstring,
-    missing-module-docstring,
-    protected-access, # Used a lot in tests, maybe make this tests-specific?
-    too-few-public-methods,
-    too-many-arguments,
-    too-many-branches,
-    too-many-instance-attributes,
-    too-many-locals,
-    too-many-return-statements,
-    too-many-statements,
-    wrong-import-order,
-    wrong-import-position,
+disable=E,W,R,C,F

devbin/benchmark_ipcmap.py

@@ -21,8 +21,8 @@
 MYDIR = os.path.dirname(os.path.abspath(__file__))
 sys.path.insert(0, os.path.join(MYDIR, ".."))
 
-from tests import testutils
-from px import px_file
+from tests import testutils  # noqa: E402
+from px import px_file  # noqa: E402
 
 
 # For how long should we do the benchmarking run (in seconds)

devbin/benchmark_proc_get_all.py

@@ -14,7 +14,7 @@
 MYDIR = os.path.dirname(os.path.abspath(__file__))
 sys.path.insert(0, os.path.join(MYDIR, ".."))
 
-from px import px_process
+from px import px_process  # noqa: E402
 
 LAPS = 20
 

px/px.py

@@ -98,7 +98,7 @@ def main():
 
     try:
         _main(argv)
-    except Exception:  # pylint: disable=broad-except
+    except Exception:
         LOG = logging.getLogger(__name__)
         LOG.exception("Uncaught Exception")
 
@@ -139,7 +139,7 @@ def handleLogMessages(messages: Optional[str]) -> None:
     # even if we don't use it. And this will make test avoidance fail to avoid
     # px.py tests every time you make a new commit (because committing recreates
     # version.py).
-    from . import version  # pylint: disable=import-outside-toplevel
+    from . import version
 
     sys.stderr.write("px version: " + version.VERSION + "\n")
 
@@ -168,7 +168,7 @@ def _main(argv: List[str]) -> None:
         # NOTE: If we "import version" at the top of this file, we will depend on it even if
         # we don't use it. And this will make test avoidance fail to avoid px.py tests every
         # time you make a new commit (because committing recreates version.py).
-        from . import version  # pylint: disable=import-outside-toplevel
+        from . import version
 
         print(version.VERSION)
         return
@@ -236,14 +236,14 @@ def _main(argv: List[str]) -> None:
 
     if top:
         # Pulling px_top in on demand like this improves test result caching
-        from . import px_top  # pylint: disable=import-outside-toplevel
+        from . import px_top
 
         px_top.top(search=search)
         return
 
     if tree:
         # Pulling px_tree in on demand like this improves test result caching
-        from . import px_tree  # pylint: disable=import-outside-toplevel
+        from . import px_tree
 
         px_tree.tree(search=search)
         return

px/px_cpuinfo.py

@@ -93,7 +93,6 @@ def get_core_count_from_sysctl() -> Optional[Tuple[int, int]]:
 def parse_sysctl_output(
     sysctl_lines: List[str],
 ) -> Tuple[Optional[int], Optional[int]]:
-
     # Note the ending spaces, they must be there for number extraction to work!
     PHYSICAL_PREFIX = "hw.physicalcpu: "
     LOGICAL_PREFIX = "hw.logicalcpu: "

px/px_cwdfriends.py

@@ -19,7 +19,6 @@ def __init__(
         all_processes: List[px_process.PxProcess],
         all_files: List[px_file.PxFile],
     ) -> None:
-
         pid_to_process: Dict[int, px_process.PxProcess] = {}
         for p in all_processes:
             pid_to_process[p.pid] = p

px/px_file.py

@@ -177,7 +177,7 @@ def resolve_endpoint(endpoint: str) -> str:
 
     try:
         host = socket.gethostbyaddr(address)[0]
-    except Exception:  # pylint: disable=broad-except
+    except Exception:
         # Lookup failed for whatever reason, give up
         #
         # Catching "Exception" because I am (on 2022may27) unable to figure out

px/px_install.py

@@ -12,7 +12,7 @@ def install(src, dest):
     """
     try:
         _install(src, dest)
-    except Exception as e:  # pylint: disable=broad-except
+    except Exception as e:
         sys.stderr.write(f"Installing {dest} failed, please retry with sudo\n")
         sys.stderr.write(f"Error was: {str(e)}\n")
         sys.exit(1)

px/px_ioload.py

@@ -159,7 +159,6 @@ def parse_proc_diskstats(proc_diskstats_contents: str) -> List[Sample]:
 
 class SubsystemStat:
     def __init__(self, throughput: float, high_watermark: float) -> None:
-
         if throughput > high_watermark:
             raise ValueError(
                 f"High watermark {high_watermark} lower than throughput {throughput}"
@@ -247,7 +246,6 @@ def update_baseline_from_system(self, system_state: SystemState) -> None:
             del self.baseline[remove_me]
 
     def update(self) -> None:
-
         self.previous_system_state = self.most_recent_system_state
         self.most_recent_system_state = SystemState()
         self.update_baseline_from_system(self.most_recent_system_state)
@@ -342,7 +340,6 @@ def get_load_string(self) -> str:
             math.trunc(bottleneck[1]), math.trunc(bottleneck[2])
         )
 
-        # pylint: disable=consider-using-f-string
         return "[{} / {}] {}".format(
             px_terminal.bold(current_throughput + "/s"),
             max_throughput + "/s",

px/px_ipc_map.py

@@ -39,7 +39,6 @@ def __str__(self):
 
 
 class IpcMap:
-    # pylint: disable=attribute-defined-outside-init
     """
     This is a map of process->[channels], where "process" is a process we have
     IPC communication open with, and a channel is a socket or a pipe that we
@@ -59,7 +58,6 @@ def __init__(
         processes: Iterable[px_process.PxProcess],
         is_root: bool,
     ) -> None:
-
         # On Linux, lsof reports the same open file once per thread of a
         # process. Putting the files in a set gives us each file only once.
         files = set(files)
@@ -130,7 +128,7 @@ def _create_fds(self, is_root: bool) -> Dict[int, str]:
             fds[network_connection.fd] = str(network_connection)
 
         # Traverse our IPC structure and update FDs as required
-        for target in self.keys():  # pylint: disable=consider-using-dict-items
+        for target in self.keys():
             for link in self[target]:
                 if link.fd is None:
                     # No FD, never mind

px/px_launchcounter.py

@@ -98,7 +98,6 @@ def _merge_tuple_lists(
 
 
 def _callchain(process: px_process.PxProcess) -> Tuple[str, ...]:
-
     reverse_callchain: List[str] = []
 
     current: Optional[px_process.PxProcess] = process
@@ -125,7 +124,6 @@ def _register_launches(self, new_processes: List[px_process.PxProcess]) -> None:
                 self._hierarchies[callchain] = 1
 
     def update(self, procs_snapshot: List[px_process.PxProcess]) -> None:
-
         if self._last_processlist is None:
             self._last_processlist = procs_snapshot
             return
@@ -155,7 +153,6 @@ def _coalesce_launchers(self) -> List[List[Tuple[str, int]]]:
         return coalesced
 
     def get_screen_lines(self) -> List[str]:
-
         launchers_list = self._coalesce_launchers()
         launchers_list = sort_launchers_list(launchers_list)
 

px/px_loginhistory.py

@@ -106,7 +106,7 @@ def get_users_at(
             from_timestamp = _to_timestamp(from_s, now)
             if timestamp < from_timestamp:
                 continue
-        except Exception:  # pylint: disable=broad-except
+        except Exception:
             LOG.error("Problematic1 last line: <%s>", line)
             continue
 
@@ -120,7 +120,7 @@ def get_users_at(
             to_timestamp = from_timestamp + duration_delta
             if timestamp > to_timestamp:
                 continue
-        except Exception:  # pylint: disable=broad-except
+        except Exception:
             LOG.error("Problematic2 last line: <%s>", line)
 
         users.add(username)

px/px_meminfo.py

@@ -20,7 +20,6 @@
 
 
 def get_meminfo() -> str:
-
     total_ram_bytes, wanted_ram_bytes = _get_ram_numbers()
     percentage = (100.0 * wanted_ram_bytes) / total_ram_bytes
 
@@ -82,7 +81,6 @@ def _update_from_meminfo(base: Optional[int], line: str, name: str) -> Optional[
 def _get_ram_numbers_from_proc(
     proc_meminfo: str = "/proc/meminfo",
 ) -> Optional[Tuple[int, int]]:
-
     total_kb: Optional[int] = None
     available_kb: Optional[int] = None
     free_kb: Optional[int] = None
@@ -188,7 +186,6 @@ def _update_if_prefix(base: Optional[int], line: str, prefix: str) -> Optional[i
 def _get_ram_numbers_from_vm_stat_output(
     vm_stat_lines: List[str],
 ) -> Optional[Tuple[int, int]]:
-
     # List based on https://apple.stackexchange.com/a/196925/182882
     page_size_bytes = None
     pages_free = None

px/px_pager.py

@@ -36,7 +36,7 @@ def _pump_info_to_fd(with_fileno, process, processes):
             LOG.warning(
                 "Unexpected OSError pumping process info into pager", exc_info=True
             )
-    except Exception:  # pylint: disable=broad-except
+    except Exception:
         # Logging exceptions on warning level will make them visible to somebody
         # who changes the LOGLEVEL in px.py, but not to ordinary users.
         #
@@ -117,7 +117,6 @@ def launch_pager():
 def page_process_info(
     process: px_process.PxProcess, processes: List[px_process.PxProcess]
 ) -> None:
-
     pager = launch_pager()
     pager_stdin = pager.stdin
     assert pager_stdin is not None
@@ -130,7 +129,7 @@ def page_process_info(
     # Terminating ptop while this is running is fine. This is deprecated since
     # Python 3.10, but we want to support older Pythons as well so let's keep it
     # this way for now.
-    info_thread.setDaemon(True)  # pylint: disable=deprecated-method
+    info_thread.setDaemon(True)
 
     info_thread.start()
 

px/px_process.py

@@ -81,7 +81,6 @@ def _parse_time(time_s: str) -> datetime.datetime:
 
 
 class PxProcess:
-    # pylint: disable=attribute-defined-outside-init
     def __init__(
         self,
         cmdline: str,
@@ -254,7 +253,6 @@ def __init__(self):
         self.memory_percent: Optional[float] = None
 
     def __repr__(self):
-        # pylint: disable=consider-using-f-string
         return (
             "start_time_string=%r pid=%r ppid=%r user=%r cpu%%=%r cputime=%r mem%%=%r cmd=<%r>"
             % (

px/px_processinfo.py

@@ -194,7 +194,6 @@ def print_users_when_process_started(fd: int, process: px_process.PxProcess) ->
 
 
 def to_ipc_lines(ipc_map: px_ipc_map.IpcMap) -> Iterable[str]:
-
     return_me = []
     for target in sorted(ipc_map.keys(), key=operator.attrgetter("name", "pid")):
         channels = ipc_map[target]
@@ -234,7 +233,6 @@ def print_cwd_friends(fd, process, all_processes, all_files):
 def print_fds(
     fd: int, process: px_process.PxProcess, processes: Iterable[px_process.PxProcess]
 ) -> None:
-
     # It's true, I measured it myself /[email protected]
     println(
         fd,
@@ -299,7 +297,6 @@ def print_fds(
 
 
 def print_start_time(fd: int, process: px_process.PxProcess) -> None:
-    # pylint: disable=consider-using-f-string
     println(
         fd,
         "{} {} was started by {}, at {}.".format(
@@ -312,7 +309,6 @@ def print_start_time(fd: int, process: px_process.PxProcess) -> None:
 
     if process.cpu_time_seconds and process.age_seconds:
         cpu_percent = 100.0 * process.cpu_time_seconds / process.age_seconds
-        # pylint: disable=consider-using-f-string
         println(
             fd,
             "{} has been its average CPU usage since then, or {}/{}".format(

px/px_top.py

@@ -516,7 +516,6 @@ def get_command(**kwargs):
 
 
 def _top(search: str = "") -> None:
-
     global search_string
     search_string = search
 
@@ -554,7 +553,6 @@ def _top(search: str = "") -> None:
 
 
 def top(search: str = "") -> None:
-
     if not sys.stdout.isatty():
         sys.stderr.write(
             'Top mode only works on TTYs, try running just "px" instead.\n'
@@ -564,7 +562,7 @@ def top(search: str = "") -> None:
     with px_terminal.fullscreen_display():
         try:
             _top(search=search)
-        except Exception:  # pylint: disable=broad-except
+        except Exception:
             LOG.exception("Running ptop failed")
 
         # Make sure we actually end up on a new line

setup.py

@@ -85,7 +85,7 @@
             "ptop = px.px:main",
             "pxtree = px.px:main",
         ],
-    }
+    },
     # Note that we're by design *not* installing man pages here.
     # Using "data_files=" only puts the man pages in the egg file,
     # and installing that egg doesn't put them on the destination

tests/px_exec_util_test.py

@@ -14,10 +14,7 @@ def test_exec_true_with_check():
 def test_exec_false_with_check():
     try:
         px_exec_util.run(["false"], check_exitcode=True)
-        assert (
-            False  # pylint: disable=condition-evals-to-constant
-            and "We should never get here"
-        )
+        assert False and "We should never get here"
     except subprocess.CalledProcessError:
         # This is the exception we want, done!
         pass

tests/px_loginhistory_test.py

@@ -9,8 +9,6 @@
 
 # These warnings conflict with how pytest fixtures work:
 # https://docs.pytest.org/en/6.2.x/fixture.html
-#
-# pylint: disable=redefined-outer-name,unused-argument
 
 
 @pytest.fixture