remove Popen.wait() method (duplicate)

2 files changed, 1 insertions, 12 deletions

diff --git a/psutil/__init__.py b/psutil/__init__.py
index 0dd7077c..b03ffaee 100644
--- a/psutil/__init__.py
+++ b/psutil/__init__.py
@@ -1363,17 +1363,6 @@ class Popen(Process):
                 raise AttributeError("%s instance has no attribute '%s'"
                                      % (self.__class__.__name__, name))
 
-    def wait(self, timeout=None):
-        if self.__subproc.returncode is not None:
-            return self.__subproc.returncode
-        # Note: using psutil's wait() on UNIX should make no difference.
-        # On Windows it does, because PID can still be alive (see
-        # _pswindows.py counterpart addressing this). Python 2.7 doesn't
-        # have timeout arg, so this acts as a backport.
-        ret = Process.wait(self, timeout)
-        self.__subproc.returncode = ret
-        return ret
-
 
 # =====================================================================
 # --- system processes related functions
diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py
index 3c1d9015..ed06df77 100644
--- a/psutil/tests/__init__.py
+++ b/psutil/tests/__init__.py
@@ -883,7 +883,7 @@ class PsutilTestCase(TestCase):
         if isinstance(proc, (psutil.Process, psutil.Popen)):
             assert not proc.is_running()
             self.assertRaises(psutil.NoSuchProcess, proc.status)
-        proc.wait(timeout=0)  # assert not raise TimeoutExpired
+            proc.wait(timeout=0)  # assert not raise TimeoutExpired
         self.assertPidGone(proc.pid)