From 29b3f2ab3b216e7499f7e02daca67f01bf3edd05 Mon Sep 17 00:00:00 2001 From: echel0n Date: Wed, 30 Jul 2014 18:17:12 -0700 Subject: [PATCH] Fix for issues relating to subprocess imports and BRANCH checks --- sickbeard/versionChecker.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sickbeard/versionChecker.py b/sickbeard/versionChecker.py index ea703100..b9161ab4 100644 --- a/sickbeard/versionChecker.py +++ b/sickbeard/versionChecker.py @@ -35,8 +35,6 @@ from sickbeard import logger from sickbeard.exceptions import ex from sickbeard import encodingKludge as ek -from subprocess import check_output, PIPE, Popen - class CheckVersion(): """ @@ -769,12 +767,12 @@ class SourceUpdateManager(UpdateManager): yield "040000 tree {}\t{}\0".format(sha1, d) def _mktree(self, files, dirs): - mkt = Popen(["git", "mktree", "-z"], stdin=PIPE, stdout=PIPE) + mkt = subprocess.Popen(["git", "mktree", "-z"], stdin=subprocess.PIPE, stdout=subprocess.PIPE) return mkt.communicate("".join(self._lstree(files, dirs)))[0].strip() def hash_file(self, path): """Write file at path to Git index, return its SHA1 as a string.""" - return check_output(["git", "hash-object", "-w", "--", path]).strip() + return subprocess.check_output(["git", "hash-object", "-w", "--", path]).strip() def hash_dir(self, path): """Write directory at path to Git index, return its SHA1 as a string."""