Merge branch 'PR-non-ascii-filenames' of https://github.com/xarx00/Gi… · gitpython-developers/GitPython@3b13c11 (original) (raw)

Skip to content

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sign up

Appearance settings

Commit 3b13c11

author

Sebastian Thiel

committed

File tree

3 files changed

lines changed

3 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -30,7 +30,10 @@
30 30 is_win = (os.name == 'nt')
31 31 is_posix = (os.name == 'posix')
32 32 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()
34 37
35 38 if PY3:
36 39 import io
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
4 4 # This module is part of GitPython and is released under
5 5 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
6 6
7 +from builtins import str
7 8 from collections import namedtuple
8 9 import logging
9 10 import os
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
1 1 gitdb2 (>=2.0.0)
2 +gitdb>=0.6.4
3 +ddt>=1.1.1
4 +future>=0.9