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.

lib/ansible/plugins/lookup/ini.py

@@ -31,7 +31,7 @@ from ansible.plugins.lookup import LookupBase
 def _parse_params(term):
     '''Safely split parameter term to preserve spaces'''
 
-    keys = ['key', 'type', 'section', 'file', 're', 'default', 'encoding']
+    keys = ['key', 'type', 'section', 'file', 're', 'default']
     params = {}
     for k in keys:
         params[k] = ''
@@ -52,6 +52,19 @@ def _parse_params(term):
 
 class LookupModule(LookupBase):
 
+    def read_properties(self, filename, key, dflt, is_regexp):
+        config = StringIO()
+        current_cfg_file = open(to_bytes(filename, errors='surrogate_or_strict'), 'rb')
+
+        config.write(u'[java_properties]\n' + to_text(current_cfg_file.read(), errors='surrogate_or_strict'))
+        config.seek(0, os.SEEK_SET)
+        self.cp.readfp(config)
+        return self.get_value(key, 'java_properties', dflt, is_regexp)
+
+    def read_ini(self, filename, key, section, dflt, is_regexp):
+        self.cp.readfp(open(to_bytes(filename, errors='surrogate_or_strict')))
+        return self.get_value(key, section, dflt, is_regexp)
+
     def get_value(self, key, section, dflt, is_regexp):
         # Retrieve all values from a section using a regexp
         if is_regexp:
@@ -66,6 +79,8 @@ class LookupModule(LookupBase):
 
     def run(self, terms, variables=None, **kwargs):
 
+        basedir = self.get_basedir(variables)
+        self.basedir = basedir
         self.cp = configparser.ConfigParser()
 
         ret = []
@@ -79,7 +94,6 @@ class LookupModule(LookupBase):
                 'default': None,
                 'section': "global",
                 'type': "ini",
-                'encoding': 'utf-8',
             }
 
             # parameters specified?
@@ -91,23 +105,11 @@ class LookupModule(LookupBase):
             except (ValueError, AssertionError) as e:
                 raise AnsibleError(e)
 
-            # Retrieve file path
             path = self.find_file_in_search_path(variables, 'files', paramvals['file'])
-
-            # Create StringIO later used to parse ini
-            config = StringIO()
-            # Special case for java properties
             if paramvals['type'] == "properties":
-                config.write(u'[java_properties]\n')
-                paramvals['section'] = 'java_properties'
-
-            # Open file using encoding
-            contents, show_data = self._loader._get_file_contents(path, encoding=paramvals['encoding'])
-            config.write(contents)
-            config.seek(0, os.SEEK_SET)
-
-            self.cp.readfp(config)
-            var = self.get_value(key, paramvals['section'], paramvals['default'], paramvals['re'])
+                var = self.read_properties(path, key, paramvals['default'], paramvals['re'])
+            else:
+                var = self.read_ini(path, key, paramvals['section'], paramvals['default'], paramvals['re'])
             if var is not None:
                 if isinstance(var, MutableSequence):
                     for v in var: