diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2015-01-06 16:11:34 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2015-01-06 16:11:34 +0100 |
| commit | 56e942318f3c493c8dcd4759f806034331ebeda5 (patch) | |
| tree | 82cdca65cd197f36ea3680171186e0ddcf234266 /git/test/test_stats.py | |
| parent | d46e3fe9cb0dea2617cd9231d29bf6919b0f1e91 (diff) | |
| parent | 68f8a43d1b643318732f30ee1cd75e1d315a4537 (diff) | |
| download | gitpython-56e942318f3c493c8dcd4759f806034331ebeda5.tar.gz | |
Merge branch 'py3' into 0.3
Conflicts:
git/refs/log.py
Diffstat (limited to 'git/test/test_stats.py')
| -rw-r--r-- | git/test/test_stats.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git/test/test_stats.py b/git/test/test_stats.py index c4535b75..884ab1ab 100644 --- a/git/test/test_stats.py +++ b/git/test/test_stats.py @@ -10,12 +10,13 @@ from git.test.lib import ( assert_equal ) from git import Stats +from git.compat import defenc class TestStats(TestBase): def test_list_from_string(self): - output = fixture('diff_numstat') + output = fixture('diff_numstat').decode(defenc) stats = Stats._list_from_string(self.rorepo, output) assert_equal(2, stats.total['files']) |