p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kill ancient capture devnullpath, os.devnull exists since py 2.4

This commit is contained in:
Ronny Pfannschmidt 2014-01-22 21:37:59 +01:00
parent d1a9ab3df0
commit b4a397d153
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
_pytest/capture.py
View File

@ -331,7 +331,7 @@ class FDCapture:
"saved filedescriptor not valid, " "saved filedescriptor not valid, "
"did you call start() twice?") "did you call start() twice?")
if self.targetfd == 0 and not self.tmpfile: if self.targetfd == 0 and not self.tmpfile:
fd = os.open(devnullpath, os.O_RDONLY) fd = os.open(os.devnull, os.O_RDONLY)
os.dup2(fd, 0) os.dup2(fd, 0)
os.close(fd) os.close(fd)
if hasattr(self, '_oldsys'): if hasattr(self, '_oldsys'):
@ -639,12 +639,3 @@ class DontReadFromInput:
def close(self): def close(self):
pass pass
try:
devnullpath = os.devnull
except AttributeError:
if os.name == 'nt':
devnullpath = 'NUL'
else:
devnullpath = '/dev/null'