Revert "Allow ini plugin to load file using other encoding than utf8." (#27407)

* Revert "Update conventions in azure modules"

This reverts commit 30a688d8d3.

* Revert "Allow specific __future__ imports in modules"

This reverts commit 3a2670e0fd.

* Revert "Fix wildcard import in galaxy/token.py"

This reverts commit 6456891053.

* Revert "Fix one name in module error due to rewritten VariableManager"

This reverts commit 87a192fe66.

* Revert "Disable pylint check for names existing in modules for test data"

This reverts commit 6ac683ca19.

* Revert "Allow ini plugin to load file using other encoding than utf8."

This reverts commit 6a57ad34c0.
This commit is contained in:
Toshio Kuratomi 2017-07-27 17:08:31 -07:00 committed by GitHub
parent 30a688d8d3
commit 520696fb39
9 changed files with 35 additions and 78 deletions

View file

@ -24,7 +24,7 @@ class Git(object):
:rtype: list[str]
"""
cmd = ['diff'] + args
return self.run_git_split(cmd, '\n', str_errors='replace')
return self.run_git_split(cmd, '\n')
def get_diff_names(self, args):
"""
@ -76,24 +76,22 @@ class Git(object):
except SubprocessError:
return False
def run_git_split(self, cmd, separator=None, str_errors='strict'):
def run_git_split(self, cmd, separator=None):
"""
:type cmd: list[str]
:param separator: str | None
:type str_errors: 'strict' | 'replace'
:rtype: list[str]
"""
output = self.run_git(cmd, str_errors=str_errors).strip(separator)
output = self.run_git(cmd).strip(separator)
if not output:
return []
return output.split(separator)
def run_git(self, cmd, str_errors='strict'):
def run_git(self, cmd):
"""
:type cmd: list[str]
:type str_errors: 'strict' | 'replace'
:rtype: str
"""
return run_command(self.args, [self.git] + cmd, capture=True, always=True, str_errors=str_errors)[0]
return run_command(self.args, [self.git] + cmd, capture=True, always=True)[0]