Skip to content

Commit 3b13c11

Browse files
author
Sebastian Thiel
committed
Merge branch 'PR-non-ascii-filenames' of https://github.com/xarx00/GitPython into xarx00-PR-non-ascii-filenames
2 parents da8aeec + a77eab2 commit 3b13c11

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

Diff for: git/compat.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@
3030
is_win = (os.name == 'nt')
3131
is_posix = (os.name == 'posix')
3232
is_darwin = (os.name == 'darwin')
33-
defenc = sys.getdefaultencoding()
33+
if hasattr(sys, 'getfilesystemencoding'):
34+
defenc = sys.getfilesystemencoding()
35+
if defenc is None:
36+
defenc = sys.getdefaultencoding()
3437

3538
if PY3:
3639
import io

Diff for: git/repo/base.py

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# This module is part of GitPython and is released under
55
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
66

7+
from builtins import str
78
from collections import namedtuple
89
import logging
910
import os

Diff for: requirements.txt

+3
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
gitdb2 (>=2.0.0)
2+
gitdb>=0.6.4
3+
ddt>=1.1.1
4+
future>=0.9

0 commit comments

Comments
 (0)