diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2016-10-16 15:09:38 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2016-10-16 15:09:38 +0200 |
| commit | 9e4a4545dd513204efb6afe40e4b50c3b5f77e50 (patch) | |
| tree | 54ffff6c8dba0410693673caa38124a704ac9224 /git/objects/fun.py | |
| parent | 93d530234a4f5533aa99c3b897bb56d375c2ae60 (diff) | |
| download | gitpython-9e4a4545dd513204efb6afe40e4b50c3b5f77e50.tar.gz | |
fix(surrogateescape): enable on py2, fix tests
Diffstat (limited to 'git/objects/fun.py')
| -rw-r--r-- | git/objects/fun.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git/objects/fun.py b/git/objects/fun.py index a144ba7e..d5b3f902 100644 --- a/git/objects/fun.py +++ b/git/objects/fun.py @@ -2,6 +2,7 @@ from stat import S_ISDIR from git.compat import ( byte_ord, + safe_decode, defenc, xrange, text_type, @@ -76,7 +77,7 @@ def tree_entries_from_data(data): # default encoding for strings in git is utf8 # Only use the respective unicode object if the byte stream was encoded name = data[ns:i] - name = name.decode(defenc, 'surrogateescape') + name = safe_decode(name) # byte is NULL, get next 20 i += 1 |