fix failing test

giampaolo · Dec 20, 2024 · aa5591e · aa5591e
1 parent dd17b7a
commit aa5591e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/psutil/_pssunos.py b/psutil/_pssunos.py
@@ -676,7 +676,9 @@ def net_connections(self, kind='inet'):
     @wrap_exceptions
     def memory_maps(self):
         def toaddr(start, end):
-            return f"{hex(start)[2:].strip('L')}-{hex(end)[2:].strip('L')}"
+            return "{}-{}".format(
+                hex(start)[2:].strip('L'), hex(end)[2:].strip('L')
+            )
 
         procfs_path = self._procfs_path
         retlist = []

diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py
@@ -1023,7 +1023,7 @@ def test_cpu_affinity_errs(self):
             p.cpu_affinity(invalid_cpu)
         with pytest.raises(ValueError):
             p.cpu_affinity(range(10000, 11000))
-        with pytest.raises(TypeError):
+        with pytest.raises((TypeError, ValueError)):
             p.cpu_affinity([0, "1"])
         with pytest.raises(ValueError):
             p.cpu_affinity([0, -1])