summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2016-10-24 21:14:58 +0200
committerGiampaolo Rodola <g.rodola@gmail.com>2016-10-24 21:14:58 +0200
commit47082362ad45bd5bb283226eb16d945a19b3e7bc (patch)
tree602925144f5615925b1721223ab9d19106982ba6
parent82c0876f1bec1e1b758bdcbbafb88f0c02cb3751 (diff)
downloadpsutil-47082362ad45bd5bb283226eb16d945a19b3e7bc.tar.gz
fix #927: Popen.__del__ may cause maximum recursion depth error.
-rw-r--r--HISTORY.rst10
-rw-r--r--psutil/__init__.py4
2 files changed, 10 insertions, 4 deletions
diff --git a/HISTORY.rst b/HISTORY.rst
index 864efe67..04e1d6cc 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,5 +1,15 @@
*Bug tracker at https://github.com/giampaolo/psutil/issues*
+
+4.4.1 - XXXX-XX-XX
+==================
+
+Bug fixes
+---------
+
+- 927_: ``Popen.__del__`` may cause maximum recursion depth error.
+
+
4.4.0 - 2016-10-23
==================
diff --git a/psutil/__init__.py b/psutil/__init__.py
index dfd3b173..575780ad 100644
--- a/psutil/__init__.py
+++ b/psutil/__init__.py
@@ -1264,10 +1264,6 @@ class Popen(Process):
def __dir__(self):
return sorted(set(dir(Popen) + dir(subprocess.Popen)))
- def __del__(self, *args, **kwargs):
- self.__subproc.__del__(*args, **kwargs)
- self.__subproc = None
-
def __enter__(self):
if hasattr(self.__subproc, '__enter__'):
self.__subproc.__enter__()