diff options
Diffstat (limited to 'git_deps/detector.py')
| -rw-r--r-- | git_deps/detector.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git_deps/detector.py b/git_deps/detector.py index 3111a38..df5b001 100644 --- a/git_deps/detector.py +++ b/git_deps/detector.py @@ -169,7 +169,7 @@ class DependencyDetector(object): '-L', "%d,+%d" % (hunk.old_start, hunk.old_lines), parent.hex, '--', path ] - blame = subprocess.check_output(cmd) + blame = subprocess.check_output(cmd, universal_newlines=True) dependent_sha1 = dependent.hex if dependent_sha1 not in self.dependencies: @@ -288,7 +288,7 @@ class DependencyDetector(object): cmd = ['git', 'merge-base', sha1, branch_sha1] # self.logger.debug(" ".join(cmd)) - out = subprocess.check_output(cmd).strip() + out = subprocess.check_output(cmd, universal_newlines=True).strip() self.logger.debug(" merge-base returned: %s" % out[:8]) result = out == sha1 self.logger.debug(" %s" % result) |