diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2016-04-12 00:31:06 +0200 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2016-04-12 00:31:06 +0200 |
commit | ab4bb494f13d8c6693fdac91f9d0afd95477cbb1 (patch) | |
tree | 69d17c0bb57c9a8850c91d5159324866a1fa1667 /psutil | |
parent | fa9952c85f28a22f00f9ddffe4c1938698e7a41c (diff) | |
download | psutil-ab4bb494f13d8c6693fdac91f9d0afd95477cbb1.tar.gz |
fix win tests
Diffstat (limited to 'psutil')
-rw-r--r-- | psutil/_pswindows.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/psutil/_pswindows.py b/psutil/_pswindows.py index 6ed0ac4a..02019ad9 100644 --- a/psutil/_pswindows.py +++ b/psutil/_pswindows.py @@ -50,6 +50,8 @@ __extra__all__ = [ CONN_DELETE_TCB = "DELETE_TCB" WAIT_TIMEOUT = 0x00000102 # 258 in decimal +ACCESS_DENIED_SET = frozenset([errno.EPERM, errno.EACCES, + cext.ERROR_ACCESS_DENIED]) if enum is None: @@ -348,14 +350,13 @@ class WindowsService(object): except WindowsError as err: NO_SUCH_SERVICE_SET = (cext.ERROR_INVALID_NAME, cext.ERROR_SERVICE_DOES_NOT_EXIST) - if err.errno in (errno.EPERM, errno.EACCES) or \ - getattr(err, "winerror", -1) == cext.ERROR_ACCESS_DENIED: + if err.errno in ACCESS_DENIED_SET: raise AccessDenied( pid=None, name=self._name, msg="service %r is not querable (not enough privileges)" % self._name) elif err.errno in NO_SUCH_SERVICE_SET or \ - getattr(err, "winerror", -1) in NO_SUCH_SERVICE_SET: + err.winerror in NO_SUCH_SERVICE_SET: raise NoSuchProcess( pid=None, name=self._name, msg="service %r does not exist)" % self._name) @@ -486,8 +487,7 @@ def wrap_exceptions(fun): try: return fun(self, *args, **kwargs) except OSError as err: - if err.errno in (errno.EPERM, errno.EACCES) or \ - getattr(err, "winerror", -1) == cext.ERROR_ACCESS_DENIED: + if err.errno in ACCESS_DENIED_SET: raise AccessDenied(self.pid, self._name) if err.errno == errno.ESRCH: raise NoSuchProcess(self.pid, self._name) |