Commit 4cede23
committed
Win, gitpython-developers#519: Ensure fixtures & bashscript checked-out eol=lf
+ FIX all Diff TCs.1 parent e61439b commit 4cede23
4 files changed
Lines changed: 6 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -35,7 +35,7 @@ install: | |||
| 35 | 35 | # | |
| 36 | 36 | - | | |
| 37 | 37 | uname -a | |
| 38 | - where git git-daemon python pip | ||
| 38 | + where git git-daemon python pip pip3 pip34 | ||
| 39 | 39 | python --version | |
| 40 | 40 | python -c "import struct; print(struct.calcsize('P') * 8)" | |
| 41 | 41 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1,2 @@ | |||
| 1 | + git/test/fixtures/* eol=lf | ||
| 2 | + init-tests-after-clone.sh | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -88,9 +88,9 @@ class UnicodeMixin(object): | |||
| 88 | 88 | """Mixin class to handle defining the proper __str__/__unicode__ | |
| 89 | 89 | methods in Python 2 or 3.""" | |
| 90 | 90 | ||
| 91 | - if sys.version_info[0] >= 3: # Python 3 | ||
| 91 | + if PY3: | ||
| 92 | 92 | def __str__(self): | |
| 93 | 93 | return self.__unicode__() | |
| 94 | 94 | else: # Python 2 | |
| 95 | 95 | def __str__(self): | |
| 96 | - return self.__unicode__().encode('utf8') | ||
| 96 | + return self.__unicode__().encode(defenc) | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -76,7 +76,7 @@ def run_commit_hook(name, index): | |||
| 76 | 76 | stdout=subprocess.PIPE, | |
| 77 | 77 | stderr=subprocess.PIPE, | |
| 78 | 78 | cwd=index.repo.working_dir, | |
| 79 | - close_fds=(is_posix), | ||
| 79 | + close_fds=is_posix, | ||
| 80 | 80 | creationflags=PROC_CREATIONFLAGS,) | |
| 81 | 81 | stdout, stderr = cmd.communicate() | |
| 82 | 82 | cmd.stdout.close() | |
0 commit comments