diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2022-05-25 14:20:31 +0200 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2022-05-25 14:20:31 +0200 |
| commit | 379598312f60bf414afa8bf549f7f26af9e578ea (patch) | |
| tree | 358329d1c4c848a99d980d64f2b27b2a7401876b /psutil | |
| parent | c14744db097b1955f2b668dc753b2d2439db0bdf (diff) | |
| download | psutil-379598312f60bf414afa8bf549f7f26af9e578ea.tar.gz | |
introduce flake8-bugbear code checker
Signed-off-by: Giampaolo Rodola <g.rodola@gmail.com>
Diffstat (limited to 'psutil')
| -rw-r--r-- | psutil/__init__.py | 2 | ||||
| -rw-r--r-- | psutil/_compat.py | 10 | ||||
| -rwxr-xr-x | psutil/tests/test_misc.py | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/psutil/__init__.py b/psutil/__init__.py index 2f2a593d..1ba0c19f 100644 --- a/psutil/__init__.py +++ b/psutil/__init__.py @@ -228,7 +228,7 @@ _SENTINEL = object() if (int(__version__.replace('.', '')) != getattr(_psplatform.cext, 'version', None)): msg = "version conflict: %r C extension module was built for another " \ - "version of psutil" % getattr(_psplatform.cext, "__file__") + "version of psutil" % _psplatform.cext.__file__ if hasattr(_psplatform.cext, 'version'): msg += " (%s instead of %s)" % ( '.'.join([x for x in str(_psplatform.cext.version)]), __version__) diff --git a/psutil/_compat.py b/psutil/_compat.py index 251e595f..52e762b1 100644 --- a/psutil/_compat.py +++ b/psutil/_compat.py @@ -232,8 +232,8 @@ except ImportError: return self.hashvalue def _make_key(args, kwds, typed, - kwd_mark=(object(), ), - fasttypes=set((int, str, frozenset, type(None))), + kwd_mark=(_SENTINEL, ), + fasttypes=set((int, str, frozenset, type(None))), # noqa sorted=sorted, tuple=tuple, type=type, len=len): key = args if kwds: @@ -442,9 +442,9 @@ try: except ImportError: @contextlib.contextmanager def redirect_stderr(new_target): - original = getattr(sys, "stderr") + original = sys.stderr try: - setattr(sys, "stderr", new_target) + sys.stderr = new_target yield new_target finally: - setattr(sys, "stderr", original) + sys.stderr = original diff --git a/psutil/tests/test_misc.py b/psutil/tests/test_misc.py index add9646e..90b49c1f 100755 --- a/psutil/tests/test_misc.py +++ b/psutil/tests/test_misc.py @@ -402,7 +402,7 @@ class TestCommonModule(PsutilTestCase): supports_ipv6.cache_clear() assert s.called else: - with self.assertRaises(Exception): + with self.assertRaises(socket.error): sock = socket.socket(socket.AF_INET6, socket.SOCK_STREAM) try: sock.bind(("::1", 0)) |