Merge branch 'master' of github.com:giampaolo/psutil

.github/workflows/build.yml

@@ -28,7 +28,7 @@ jobs:
         - {os: ubuntu-latest, arch: x86_64}
         - {os: ubuntu-latest, arch: i686}
         - {os: ubuntu-latest, arch: aarch64}
-        - {os: macos-12, arch: x86_64}
+        - {os: macos-13, arch: x86_64}
         - {os: macos-14, arch: arm64}
         - {os: windows-2019, arch: AMD64}
         - {os: windows-2019, arch: x86}
@@ -53,10 +53,10 @@ jobs:
       if: matrix.arch == 'aarch64'
 
     - name: Create wheels + run tests
-      uses: pypa/cibuildwheel@v2.21.2
+      uses: pypa/cibuildwheel@v2.22.0
       env:
         CIBW_ARCHS: "${{ matrix.arch }}"
-        CIBW_PRERELEASE_PYTHONS: True
+        CIBW_ENABLE: "cpython-prerelease"
         CIBW_TEST_EXTRAS: test
         CIBW_TEST_COMMAND:
           make -C {project} PYTHON="env python" PSUTIL_SCRIPTS_DIR="{project}/scripts" install-sysdeps install-pydeps-test install print-sysinfo test test-memleaks
@@ -82,7 +82,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-12]
+        os: [ubuntu-latest, macos-13]
     env:
       CIBW_BUILD: 'cp27-*'
       CIBW_TEST_EXTRAS: test

HISTORY.rst

@@ -1,9 +1,9 @@
 *Bug tracker at https://github.com/giampaolo/psutil/issues*
 
-6.1.1 (IN DEVELOPMENT)
-======================
+6.1.1
+=====
 
-XXXX-XX-XX
+2024-12-19
 
 **Enhancements**
 

docs/index.rst

@@ -2672,6 +2672,10 @@ PyPy3.
 Timeline
 ========
 
+- 2024-12-19:
+  `6.1.1 <https://pypi.org/project/psutil/6.1.1/#files>`__ -
+  `what's new <https://github.com/giampaolo/psutil/blob/master/HISTORY.rst#611>`__ -
+  `diff <https://github.com/giampaolo/psutil/compare/release-6.1.0...release-6.1.1#files_bucket>`__
 - 2024-10-17:
   `6.1.0 <https://pypi.org/project/psutil/6.1.0/#files>`__ -
   `what's new <https://github.com/giampaolo/psutil/blob/master/HISTORY.rst#610>`__ -

psutil/__init__.py

@@ -214,7 +214,7 @@
 AF_LINK = _psplatform.AF_LINK
 
 __author__ = "Giampaolo Rodola'"
-__version__ = "6.1.0"
+__version__ = "6.1.1"
 version_info = tuple([int(num) for num in __version__.split('.')])
 
 _timer = getattr(time, 'monotonic', time.time)
@@ -414,7 +414,7 @@ def __str__(self):
                 except AccessDenied:
                     pass
 
-            if self._exitcode not in (_SENTINEL, None):
+            if self._exitcode not in {_SENTINEL, None}:
                 info["exitcode"] = self._exitcode
             if self._create_time is not None:
                 info['started'] = _pprint_secs(self._create_time)

psutil/_common.py

@@ -547,7 +547,7 @@ def isfile_strict(path):
     try:
         st = os.stat(path)
     except OSError as err:
-        if err.errno in (errno.EPERM, errno.EACCES):
+        if err.errno in {errno.EPERM, errno.EACCES}:
             raise
         return False
     else:
@@ -562,7 +562,7 @@ def path_exists_strict(path):
     try:
         os.stat(path)
     except OSError as err:
-        if err.errno in (errno.EPERM, errno.EACCES):
+        if err.errno in {errno.EPERM, errno.EACCES}:
             raise
         return False
     else:
@@ -639,12 +639,12 @@ def socktype_to_enum(num):
 
 def conn_to_ntuple(fd, fam, type_, laddr, raddr, status, status_map, pid=None):
     """Convert a raw connection tuple to a proper ntuple."""
-    if fam in (socket.AF_INET, AF_INET6):
+    if fam in {socket.AF_INET, AF_INET6}:
         if laddr:
             laddr = addr(*laddr)
         if raddr:
             raddr = addr(*raddr)
-    if type_ == socket.SOCK_STREAM and fam in (AF_INET, AF_INET6):
+    if type_ == socket.SOCK_STREAM and fam in {AF_INET, AF_INET6}:
         status = status_map.get(status, CONN_NONE)
     else:
         status = CONN_NONE  # ignore whatever C returned to us

psutil/_compat.py

@@ -180,7 +180,7 @@ def ProcessLookupError(inst):
 
     @_instance_checking_exception(EnvironmentError)
     def PermissionError(inst):
-        return getattr(inst, 'errno', _SENTINEL) in (errno.EACCES, errno.EPERM)
+        return getattr(inst, 'errno', _SENTINEL) in {errno.EACCES, errno.EPERM}
 
     @_instance_checking_exception(EnvironmentError)
     def InterruptedError(inst):

psutil/_psbsd.py

@@ -958,7 +958,7 @@ def cpu_affinity_set(self, cpus):
                 # <<the call would leave a thread without a valid CPU to run
                 # on because the set does not overlap with the thread's
                 # anonymous mask>>
-                if err.errno in (errno.EINVAL, errno.EDEADLK):
+                if err.errno in {errno.EINVAL, errno.EDEADLK}:
                     for cpu in cpus:
                         if cpu not in allcpus:
                             raise ValueError(

psutil/_pslinux.py

@@ -706,11 +706,10 @@ def cpu_count_cores():
                 except KeyError:
                     pass
                 current_info = {}
-            else:
+            elif line.startswith((b'physical id', b'cpu cores')):
                 # ongoing section
-                if line.startswith((b'physical id', b'cpu cores')):
-                    key, value = line.split(b'\t:', 1)
-                    current_info[key] = int(value)
+                key, value = line.split(b'\t:', 1)
+                current_info[key] = int(value)
 
     result = sum(mapping.values())
     return result or None  # mimic os.cpu_count()
@@ -1040,7 +1039,7 @@ def retrieve(self, kind, pid=None):
         ret = set()
         for proto_name, family, type_ in self.tmap[kind]:
             path = "%s/net/%s" % (self._procfs_path, proto_name)
-            if family in (socket.AF_INET, socket.AF_INET6):
+            if family in {socket.AF_INET, socket.AF_INET6}:
                 ls = self.process_inet(
                     path, family, type_, inodes, filter_pid=pid
                 )
@@ -1358,7 +1357,7 @@ def disk_partitions(all=False):
         device, mountpoint, fstype, opts = partition
         if device == 'none':
             device = ''
-        if device in ("/dev/root", "rootfs"):
+        if device in {"/dev/root", "rootfs"}:
             device = RootFsDeviceFinder().find() or device
         if not all:
             if not device or fstype not in fstypes:
@@ -1589,7 +1588,7 @@ def multi_bcat(*paths):
         status = cat(root + "/status", fallback="").strip().lower()
         if status == "discharging":
             power_plugged = False
-        elif status in ("charging", "full"):
+        elif status in {"charging", "full"}:
             power_plugged = True
 
     # Seconds left.
@@ -2256,7 +2255,7 @@ def ionice_get(self):
         def ionice_set(self, ioclass, value):
             if value is None:
                 value = 0
-            if value and ioclass in (IOPRIO_CLASS_IDLE, IOPRIO_CLASS_NONE):
+            if value and ioclass in {IOPRIO_CLASS_IDLE, IOPRIO_CLASS_NONE}:
                 raise ValueError("%r ioclass accepts no value" % ioclass)
             if value < 0 or value > 7:
                 msg = "value not in 0-7 range"

psutil/_pssunos.py

@@ -283,7 +283,7 @@ def net_connections(kind, _pid=-1):
         if type_ not in types:
             continue
         # TODO: refactor and use _common.conn_to_ntuple.
-        if fam in (AF_INET, AF_INET6):
+        if fam in {AF_INET, AF_INET6}:
             if laddr:
                 laddr = _common.addr(*laddr)
             if raddr:
@@ -476,7 +476,7 @@ def nice_get(self):
 
     @wrap_exceptions
     def nice_set(self, value):
-        if self.pid in (2, 3):
+        if self.pid in {2, 3}:
             # Special case PIDs: internally setpriority(3) return ESRCH
             # (no such process), no matter what.
             # The process actually exists though, as it has a name,
@@ -678,7 +678,7 @@ def net_connections(self, kind='inet'):
             os.stat('%s/%s' % (self._procfs_path, self.pid))
 
         # UNIX sockets
-        if kind in ('all', 'unix'):
+        if kind in {'all', 'unix'}:
             ret.extend([
                 _common.pconn(*conn)
                 for conn in self._get_unix_sockets(self.pid)

psutil/_pswindows.py

@@ -218,11 +218,10 @@ def py2_strencode(s):
     """
     if PY3:
         return s
+    if isinstance(s, str):
+        return s
     else:
-        if isinstance(s, str):
-            return s
-        else:
-            return s.encode(ENCODING, ENCODING_ERRS)
+        return s.encode(ENCODING, ENCODING_ERRS)
 
 
 @memoize
@@ -575,10 +574,10 @@ def _wrap_exceptions(self):
                     % self._name
                 )
                 raise AccessDenied(pid=None, name=self._name, msg=msg)
-            elif err.winerror in (
+            elif err.winerror in {
                 cext.ERROR_INVALID_NAME,
                 cext.ERROR_SERVICE_DOES_NOT_EXIST,
-            ):
+            }:
                 msg = "service %r does not exist" % self._name
                 raise NoSuchProcess(pid=None, name=self._name, msg=msg)
             else:
@@ -697,15 +696,15 @@ def as_dict(self):
 def is_permission_err(exc):
     """Return True if this is a permission error."""
     assert isinstance(exc, OSError), exc
-    if exc.errno in (errno.EPERM, errno.EACCES):
+    if exc.errno in {errno.EPERM, errno.EACCES}:
         return True
     # On Python 2 OSError doesn't always have 'winerror'. Sometimes
     # it does, in which case the original exception was WindowsError
     # (which is a subclass of OSError).
-    return getattr(exc, "winerror", -1) in (
+    return getattr(exc, "winerror", -1) in {
         cext.ERROR_ACCESS_DENIED,
         cext.ERROR_PRIVILEGE_NOT_HELD,
-    )
+    }
 
 
 def convert_oserror(exc, pid=None, name=None):
@@ -919,10 +918,10 @@ def send_signal(self, sig):
         if sig == signal.SIGTERM:
             cext.proc_kill(self.pid)
         # py >= 2.7
-        elif sig in (
+        elif sig in {
             getattr(signal, "CTRL_C_EVENT", object()),
             getattr(signal, "CTRL_BREAK_EVENT", object()),
-        ):
+        }:
             os.kill(self.pid, sig)
         else:
             msg = (
@@ -976,7 +975,7 @@ def wait(self, timeout=None):
 
     @wrap_exceptions
     def username(self):
-        if self.pid in (0, 4):
+        if self.pid in {0, 4}:
             return 'NT AUTHORITY\\SYSTEM'
         domain, user = cext.proc_username(self.pid)
         return py2_strencode(domain) + '\\' + py2_strencode(user)
@@ -1034,7 +1033,7 @@ def resume(self):
     @wrap_exceptions
     @retry_error_partial_copy
     def cwd(self):
-        if self.pid in (0, 4):
+        if self.pid in {0, 4}:
             raise AccessDenied(self.pid, self._name)
         # return a normalized pathname since the native C function appends
         # "\\" at the and of the path
@@ -1043,7 +1042,7 @@ def cwd(self):
 
     @wrap_exceptions
     def open_files(self):
-        if self.pid in (0, 4):
+        if self.pid in {0, 4}:
             return []
         ret = set()
         # Filenames come in in native format like:
@@ -1087,12 +1086,12 @@ def ionice_set(self, ioclass, value):
         if value:
             msg = "value argument not accepted on Windows"
             raise TypeError(msg)
-        if ioclass not in (
+        if ioclass not in {
             IOPRIO_VERYLOW,
             IOPRIO_LOW,
             IOPRIO_NORMAL,
             IOPRIO_HIGH,
-        ):
+        }:
             raise ValueError("%s is not a valid priority" % ioclass)
         cext.proc_io_priority_set(self.pid, ioclass)
 

psutil/tests/__init__.py

@@ -205,7 +205,7 @@ def macos_version():
     INVALID_UNICODE_SUFFIX = b"f\xc0\x80".decode('utf8', 'surrogateescape')
 else:
     INVALID_UNICODE_SUFFIX = "f\xc0\x80"
-ASCII_FS = sys.getfilesystemencoding().lower() in ('ascii', 'us-ascii')
+ASCII_FS = sys.getfilesystemencoding().lower() in {'ascii', 'us-ascii'}
 
 # --- paths
 
@@ -1739,11 +1739,11 @@ def get_free_port(host='127.0.0.1'):
 
 def bind_socket(family=AF_INET, type=SOCK_STREAM, addr=None):
     """Binds a generic socket."""
-    if addr is None and family in (AF_INET, AF_INET6):
+    if addr is None and family in {AF_INET, AF_INET6}:
         addr = ("", 0)
     sock = socket.socket(family, type)
     try:
-        if os.name not in ('nt', 'cygwin'):
+        if os.name not in {'nt', 'cygwin'}:
             sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         sock.bind(addr)
         if type == socket.SOCK_STREAM:
@@ -1874,7 +1874,7 @@ def check_connection_ntuple(conn):
 
     def check_ntuple(conn):
         has_pid = len(conn) == 7
-        assert len(conn) in (6, 7), len(conn)
+        assert len(conn) in {6, 7}, len(conn)
         assert conn[0] == conn.fd, conn.fd
         assert conn[1] == conn.family, conn.family
         assert conn[2] == conn.type, conn.type
@@ -1885,7 +1885,7 @@ def check_ntuple(conn):
             assert conn[6] == conn.pid, conn.pid
 
     def check_family(conn):
-        assert conn.family in (AF_INET, AF_INET6, AF_UNIX), conn.family
+        assert conn.family in {AF_INET, AF_INET6, AF_UNIX}, conn.family
         if enum is not None:
             assert isinstance(conn.family, enum.IntEnum), conn
         else:
@@ -1908,11 +1908,11 @@ def check_family(conn):
     def check_type(conn):
         # SOCK_SEQPACKET may happen in case of AF_UNIX socks
         SOCK_SEQPACKET = getattr(socket, "SOCK_SEQPACKET", object())
-        assert conn.type in (
+        assert conn.type in {
             socket.SOCK_STREAM,
             socket.SOCK_DGRAM,
             SOCK_SEQPACKET,
-        ), conn.type
+        }, conn.type
         if enum is not None:
             assert isinstance(conn.type, enum.IntEnum), conn
         else:
@@ -1923,7 +1923,7 @@ def check_type(conn):
     def check_addrs(conn):
         # check IP address and port sanity
         for addr in (conn.laddr, conn.raddr):
-            if conn.family in (AF_INET, AF_INET6):
+            if conn.family in {AF_INET, AF_INET6}:
                 assert isinstance(addr, tuple), type(addr)
                 if not addr:
                     continue
@@ -1939,7 +1939,7 @@ def check_status(conn):
             getattr(psutil, x) for x in dir(psutil) if x.startswith('CONN_')
         ]
         assert conn.status in valids, conn.status
-        if conn.family in (AF_INET, AF_INET6) and conn.type == SOCK_STREAM:
+        if conn.family in {AF_INET, AF_INET6} and conn.type == SOCK_STREAM:
             assert conn.status != psutil.CONN_NONE, conn.status
         else:
             assert conn.status == psutil.CONN_NONE, conn.status