LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "device.py: fix _subprocess_Popen cleanup."

Browse Source 
am: 5db18adc60

* commit '5db18adc607a0509b0646deda9c20b16a6b5f2b7':
  device.py: fix _subprocess_Popen cleanup.
This commit is contained in:
Josh Gao
2015-10-21 00:02:31 +00:00
committed by android-build-merger
parent cb241ee0e7 5db18adc60
commit 59ad70aee9
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
python-packages/adb/device.py
View File

@@ -212,6 +212,12 @@ def _subprocess_check_output(*args, **kwargs):
# Call this instead of subprocess.Popen(). Like _subprocess_check_output(). # Call this instead of subprocess.Popen(). Like _subprocess_check_output().
class _subprocess_Popen(subprocess.Popen): class _subprocess_Popen(subprocess.Popen):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
# __del__() can be called after global teardown has started, meaning
# the global references to _subprocess_Popen and the os module may
# no longer exist. We need to save local references to all global names
# used in __del__() to avoid this.
self.saved_class = _subprocess_Popen
self.saved_os = os
# Save reference to helper so that it can be deleted once it is no # Save reference to helper so that it can be deleted once it is no
# longer used. # longer used.
self.helper = _get_windows_unicode_helper(args[0]) self.helper = _get_windows_unicode_helper(args[0])
@@ -219,9 +225,9 @@ class _subprocess_Popen(subprocess.Popen):
*_get_subprocess_args(args, self.helper), **kwargs) *_get_subprocess_args(args, self.helper), **kwargs)
def __del__(self, *args, **kwargs): def __del__(self, *args, **kwargs):
super(_subprocess_Popen, self).__del__(*args, **kwargs) super(self.saved_class, self).__del__(*args, **kwargs)
if self.helper: if self.helper:
os.remove(self.helper.name) self.saved_os.remove(self.helper.name)
class AndroidDevice(object): class AndroidDevice(object):