From e0934abce15095796fda51d1086d9b94e2153b54 Mon Sep 17 00:00:00 2001 From: MJ Davis Date: Mon, 18 Dec 2017 11:11:18 -0800 Subject: [PATCH] Decode in utf-8 instead of ascii --- pygit/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pygit/__init__.py b/pygit/__init__.py index 9a0fb67..e71d61a 100644 --- a/pygit/__init__.py +++ b/pygit/__init__.py @@ -29,7 +29,7 @@ def __init__(self, repo_directory, new_repo=False): not os.access(self.repo_directory, os.R_OK) or \ not os.access(self.repo_directory, os.W_OK) or \ not subprocess.check_output(['git', 'rev-parse', '--git-dir'], - cwd=self.repo_directory).decode('ascii').split("\n")[0]: + cwd=self.repo_directory).decode('utf-8').split("\n")[0]: raise InvalidRepoDirectory("Invalid git repo directory: '{}'.\n" "repo_directory must be a root repo directory " "of git project and you must have r/w permissions.".format(self.repo_directory)) @@ -67,12 +67,12 @@ def _git(self, arg_string): :returns: The stdout of the requested git command split by '\n' in the form of a list """ arguments = ["git"] + arg_string.split() - return subprocess.check_output(arguments, cwd=self.repo_directory).decode('ascii').split("\n") + return subprocess.check_output(arguments, cwd=self.repo_directory).decode('utf-8').split("\n") def checkout_tag(self, tag_name): self._git('fetch -p') git_output = subprocess.check_output(["git", "ls-remote", "--tags"], - cwd=self.repo_directory).decode('ascii').split() + cwd=self.repo_directory).decode('utf-8').split() remote_tags = [x.replace('refs/tags/', '') for x in git_output if 'refs/tags/' in x] if tag_name not in remote_tags: raise Exception("No version tag exists in the current repo named: '{}'. ".format(tag_name))