From a2f1436477f491de8a8146beb8f7a519c95ee13f Mon Sep 17 00:00:00 2001 From: Alan Hamlett Date: Fri, 29 Aug 2014 12:46:28 -0700 Subject: [PATCH] use os.devnull for python2 support --- .../wakatime/wakatime/projects/subversion.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/plugin/packages/wakatime/wakatime/projects/subversion.py b/plugin/packages/wakatime/wakatime/projects/subversion.py index 707f4f4..a8f4fdd 100644 --- a/plugin/packages/wakatime/wakatime/projects/subversion.py +++ b/plugin/packages/wakatime/wakatime/projects/subversion.py @@ -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'