diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2017-11-13 00:27:06 +0100 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2017-11-13 00:27:06 +0100 |
commit | 684c6fb5a425a9667654d0b8a70e790f1b1069e7 (patch) | |
tree | 0db7f1deffbea3d5e58ae125ee7f150a41bbc9a6 /psutil/_pswindows.py | |
parent | 3c5438978f621f18b8e9b0b70fde4182221d7cb3 (diff) | |
parent | 4d3f5ba337c5a91efa642699cc96331718889b4f (diff) | |
download | psutil-1173-debug-mode.tar.gz |
Merge branch 'master' into 1173-debug-mode1173-debug-mode
Diffstat (limited to 'psutil/_pswindows.py')
-rw-r--r-- | psutil/_pswindows.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/psutil/_pswindows.py b/psutil/_pswindows.py index 8903a307..83936d08 100644 --- a/psutil/_pswindows.py +++ b/psutil/_pswindows.py @@ -45,6 +45,9 @@ from ._compat import lru_cache from ._compat import PY3 from ._compat import unicode from ._compat import xrange +from ._exceptions import AccessDenied +from ._exceptions import NoSuchProcess +from ._exceptions import TimeoutExpired from ._psutil_windows import ABOVE_NORMAL_PRIORITY_CLASS from ._psutil_windows import BELOW_NORMAL_PRIORITY_CLASS from ._psutil_windows import HIGH_PRIORITY_CLASS @@ -139,11 +142,6 @@ pinfo_map = dict( mem_private=21, ) -# these get overwritten on "import psutil" from the __init__.py file -NoSuchProcess = None -AccessDenied = None -TimeoutExpired = None - # ===================================================================== # --- named tuples |