Merge pull request #55472 from s0undt3ch/features/pytest-staged-9

[PyTest #9] Py2/Py3 Unicode Fixes

salt/modules/cp.py

@@ -423,6 +423,8 @@ def get_url(path, dest='', saltenv='base', makedirs=False, source_hash=None):
         log.error('Unable to fetch file %s from saltenv %s.',
                   salt.utils.url.redact_http_basic_auth(path),
                   saltenv)
+    if result:
+        return salt.utils.stringutils.to_unicode(result)
     return result
 
 
@@ -443,7 +445,7 @@ def get_file_str(path, saltenv='base'):
     if isinstance(fn_, six.string_types):
         try:
             with salt.utils.files.fopen(fn_, 'r') as fp_:
-                return fp_.read()
+                return salt.utils.stringutils.to_unicode(fp_.read())
         except IOError:
             return False
     return fn_

salt/transport/ipc.py

@@ -5,6 +5,7 @@
 
 # Import Python libs
 from __future__ import absolute_import, print_function, unicode_literals
+import sys
 import errno
 import logging
 import socket
@@ -341,10 +342,6 @@ def _connect(self, timeout=None):
     def __del__(self):
         try:
             self.close()
-        except socket.error as exc:
-            if exc.errno != errno.EBADF:
-                # If its not a bad file descriptor error, raise
-                raise
         except TypeError:
             # This is raised when Python's GC has collected objects which
             # would be needed when calling self.close()
@@ -364,7 +361,12 @@ def close(self):
         log.debug('Closing %s instance', self.__class__.__name__)
 
         if self.stream is not None and not self.stream.closed():
-            self.stream.close()
+            try:
+                self.stream.close()
+            except socket.error as exc:
+                if exc.errno != errno.EBADF:
+                    # If its not a bad file descriptor error, raise
+                    six.reraise(*sys.exc_info())
 
 
 class IPCMessageClient(IPCClient):