Skip to content

Commit cc664f0

Browse files
author
Sebastian Thiel
committed
Revert "Merge branch 'PR-non-ascii-filenames' of https://github.com/xarx00/GitPython into xarx00-PR-non-ascii-filenames"
This reverts commit 3b13c11, reversing changes made to da8aeec. It doesn't pass, unfortunately. Is it a travis issue? https://travis-ci.org/gitpython-developers/GitPython/jobs/561333763#L340
1 parent 3b13c11 commit cc664f0

File tree

3 files changed

+1
-8
lines changed

3 files changed

+1
-8
lines changed

Diff for: git/compat.py

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

3835
if PY3:
3936
import io

Diff for: git/repo/base.py

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
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
87
from collections import namedtuple
98
import logging
109
import os

Diff for: requirements.txt

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

0 commit comments

Comments
 (0)