diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2019-02-24 17:04:02 +0100 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2019-02-24 17:04:02 +0100 |
| commit | 88beee9e0d169e979a3027bf9e61c59ccc1ad6e3 (patch) | |
| tree | 43f7afcdae40826b40acf8685d18f885da1a7548 | |
| parent | ab6277ba38636359dc66c04a12515c6f8fe2571c (diff) | |
| download | psutil-88beee9e0d169e979a3027bf9e61c59ccc1ad6e3.tar.gz | |
fix #1424: workaround for subprocess bug on Windows returnin ERROR_INVALID_HANDLE on terminate()
| -rw-r--r-- | HISTORY.rst | 10 | ||||
| -rw-r--r-- | psutil/tests/__init__.py | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/HISTORY.rst b/HISTORY.rst index 1f784706..c34bc780 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -5,6 +5,11 @@ XXXX-XX-XX +**Enhancements** + +- 1420_: [Windows] in case of exception disk_usage() now also shows the path + name. + **Bug fixes** - 1394_: [Windows] Process name() and exe() may erronously return "Registry". @@ -15,11 +20,6 @@ XXXX-XX-XX - 1427_: [OSX] Process cmdline() and environ() may erroneously raise OSError on failed malloc(). -**Enhancements** - -- 1420_: [Windows] in case of exception disk_usage() now also shows the path - name. - 5.5.1 ===== diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py index b1c3c7b3..fac9083b 100644 --- a/psutil/tests/__init__.py +++ b/psutil/tests/__init__.py @@ -495,7 +495,7 @@ def reap_children(recursive=False): try: subp.terminate() except OSError as err: - if WINDOWS and err.errno == 6: # "invalid handle" + if WINDOWS and err.winerror == 6: # "invalid handle" pass elif err.errno != errno.ESRCH: raise |