use os.devnull for python2 support

This commit is contained in:
Alan Hamlett 2014-08-29 12:45:52 -07:00
parent c1164d2bd1
commit 138be33349

View file

@ -12,7 +12,7 @@
import logging
import os
import platform
from subprocess import Popen, PIPE, DEVNULL
from subprocess import Popen, PIPE
from .base import BaseProject
try:
@ -54,12 +54,13 @@ class Subversion(BaseProject):
'/usr/local/bin/svn',
]
for location in locations:
try:
Popen([location, '--version'], stdout=DEVNULL, stderr=DEVNULL)
self.binary_location = location
return location
except:
pass
with open(os.devnull, 'wb') as DEVNULL:
try:
Popen([location, '--version'], stdout=DEVNULL, stderr=DEVNULL)
self.binary_location = location
return location
except:
pass
self.binary_location = 'svn'
return 'svn'