diff options
Diffstat (limited to 'lib/git')
| -rw-r--r-- | lib/git/__init__.py | 2 | ||||
| -rw-r--r-- | lib/git/cmd.py (renamed from lib/git/gitter.py) | 5 | ||||
| -rw-r--r-- | lib/git/repo.py | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/lib/git/__init__.py b/lib/git/__init__.py index 66ce9a45..54f77baf 100644 --- a/lib/git/__init__.py +++ b/lib/git/__init__.py @@ -11,7 +11,7 @@ from git.blob import Blob from git.commit import Commit from git.diff import Diff from git.errors import InvalidGitRepositoryError, NoSuchPathError, GitCommandError -from git.gitter import Git +from git.cmd import Git from git.head import Head from git.repo import Repo from git.stats import Stats diff --git a/lib/git/gitter.py b/lib/git/cmd.py index 422552a7..80ef6a78 100644 --- a/lib/git/gitter.py +++ b/lib/git/cmd.py @@ -103,10 +103,9 @@ class Git(MethodMissingMixin): ) # Wait for the process to return - stdout_value, err = proc.communicate() + status = proc.wait() + stdout_value = proc.stdout.read() proc.stdout.close() - if proc.stderr: - proc.stderr.close() # Strip off trailing whitespace by default if not with_raw_output: diff --git a/lib/git/repo.py b/lib/git/repo.py index c130650e..015ce4a8 100644 --- a/lib/git/repo.py +++ b/lib/git/repo.py @@ -2,7 +2,7 @@ import os import re from errors import InvalidGitRepositoryError, NoSuchPathError from utils import touch -from gitter import Git +from cmd import Git from head import Head from blob import Blob from tag import Tag |