diff options
author | Erik M. Bray <erik.bray@lri.fr> | 2016-09-29 12:42:09 +0200 |
---|---|---|
committer | Erik M. Bray <erik.bray@lri.fr> | 2016-09-29 12:42:09 +0200 |
commit | 3898f5b14aa47e11996a3873d5af2a1ac1a4574e (patch) | |
tree | 4a2a2a7b63333b44f03f312df296805f46ed7dce | |
parent | 64e3a7f11834c4800285802eb57429a45b582061 (diff) | |
download | psutil-3898f5b14aa47e11996a3873d5af2a1ac1a4574e.tar.gz |
Right--keep forgetting IOError is not same as OSError on Python 2
-rw-r--r-- | psutil/tests/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py index 351ffb14..7b42bab6 100644 --- a/psutil/tests/__init__.py +++ b/psutil/tests/__init__.py @@ -396,7 +396,7 @@ def wait_for_file(fname, timeout=GLOBAL_TIMEOUT, empty=False, if delete_file: os.remove(fname) return data - except OSError as exc: + except (IOError, OSError) as exc: if not ((sys.platform.startswith('win') and exc.winerror == ERROR_SHARING_VIOLATION) or exc.errno == errno.ENOENT): |