Python3: Decode file content when reading it

Signed-off-by: Aline Manera <[email protected]>

disks.py

@@ -36,12 +36,12 @@ def _get_dev_node_path(maj_min):
     dm_name = '/sys/dev/block/%s/dm/name' % maj_min
     if os.path.exists(dm_name):
         with open(dm_name) as dm_f:
-            content = dm_f.read().rstrip('\n')
+            content = dm_f.read().decode('utf-8').rstrip('\n')
         return '/dev/mapper/' + content
 
     uevent = '/sys/dev/block/%s/uevent' % maj_min
     with open(uevent) as ueventf:
-        content = ueventf.read()
+        content = ueventf.read().decode('utf-8')
 
     data = dict(re.findall(r'(\S+)=(".*?"|\S+)', content.replace('\n', ' ')))
 

model/libvirtstoragepool.py

@@ -104,7 +104,7 @@ def prepare(self, conn):
             except TimeoutExpired:
                 raise InvalidParameter('KCHPOOL0012E', {'path': export_path})
             with open('/proc/mounts', 'rb') as f:
-                rawMounts = f.read()
+                rawMounts = f.read().decode('utf-8')
             output_items = ['dev_path', 'mnt_point', 'type']
             mounts = parse_cmd_output(rawMounts, output_items)
             for item in mounts:

model/vms.py

@@ -1916,7 +1916,7 @@ def _set_password_less_login(self, remote_host, user, passwd):
         def read_id_rsa_pub_file():
             data = None
             with open(id_rsa_pub_file, 'r') as id_file:
-                data = id_file.read()
+                data = id_file.read().decode('utf-8')
             return data
 
         def create_root_ssh_key_if_required():

screenshot.py

@@ -144,7 +144,7 @@ def _get_test_result(self):
             return
 
         fd = open(pipe, 'r')
-        data = fd.read()
+        data = fd.read().decode('utf-8')
         fd.close()
 
         if len(data) >= self.MAX_STREAM_ATTEMPTS or bool('+' in data):