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.

test/runner/lib/git.py

@@ -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]

test/runner/lib/util.py

@@ -81,7 +81,7 @@ def find_executable(executable, cwd=None, path=None, required=True):
 
 
 def run_command(args, cmd, capture=False, env=None, data=None, cwd=None, always=False, stdin=None, stdout=None,
-                cmd_verbosity=1, str_errors='strict'):
+                cmd_verbosity=1):
     """
     :type args: CommonConfig
     :type cmd: collections.Iterable[str]
@@ -93,16 +93,15 @@ def run_command(args, cmd, capture=False, env=None, data=None, cwd=None, always=
     :type stdin: file | None
     :type stdout: file | None
     :type cmd_verbosity: int
-    :type str_errors: 'strict' | 'replace'
     :rtype: str | None, str | None
     """
     explain = args.explain and not always
     return raw_command(cmd, capture=capture, env=env, data=data, cwd=cwd, explain=explain, stdin=stdin, stdout=stdout,
-                       cmd_verbosity=cmd_verbosity, str_errors=str_errors)
+                       cmd_verbosity=cmd_verbosity)
 
 
 def raw_command(cmd, capture=False, env=None, data=None, cwd=None, explain=False, stdin=None, stdout=None,
-                cmd_verbosity=1, str_errors='strict'):
+                cmd_verbosity=1):
     """
     :type cmd: collections.Iterable[str]
     :type capture: bool
@@ -113,7 +112,6 @@ def raw_command(cmd, capture=False, env=None, data=None, cwd=None, explain=False
     :type stdin: file | None
     :type stdout: file | None
     :type cmd_verbosity: int
-    :type str_errors: 'strict' | 'replace'
     :rtype: str | None, str | None
     """
     if not cwd:
@@ -172,8 +170,8 @@ def raw_command(cmd, capture=False, env=None, data=None, cwd=None, explain=False
         encoding = 'utf-8'
         data_bytes = data.encode(encoding) if data else None
         stdout_bytes, stderr_bytes = process.communicate(data_bytes)
-        stdout_text = stdout_bytes.decode(encoding, str_errors) if stdout_bytes else u''
-        stderr_text = stderr_bytes.decode(encoding, str_errors) if stderr_bytes else u''
+        stdout_text = stdout_bytes.decode(encoding) if stdout_bytes else u''
+        stderr_text = stderr_bytes.decode(encoding) if stderr_bytes else u''
     else:
         process.wait()
         stdout_text, stderr_text = None, None