Merge pull request #42529 from gtmanfred/2017.7

Fix joyent for python3

doc/topics/releases/2017.7.0.rst

@@ -28,8 +28,6 @@ The following salt-cloud drivers have known issues running with Python 3. These
 
 - Joyent
 
-- Any driver that relies on the `apache-libcloud` library such as cloudstack, dimenstiondata, gce, nova, and openstack
-
 - When running under Python 3, users who require Unicode support should ensure that a locale is set on their machines.
   Users using the `C` locale are advised to switch to a UTF-aware locale to ensure proper functionality with Salt with Python 3.
 

salt/cloud/clouds/joyent.py

@@ -1071,10 +1071,10 @@ def query(action=None,
     timenow = datetime.datetime.utcnow()
     timestamp = timenow.strftime('%a, %d %b %Y %H:%M:%S %Z').strip()
     with salt.utils.fopen(ssh_keyfile, 'r') as kh_:
-        rsa_key = RSA.importKey(kh_)
+        rsa_key = RSA.importKey(kh_.read())
     rsa_ = PKCS1_v1_5.new(rsa_key)
     hash_ = SHA256.new()
-    hash_.update(timestamp)
+    hash_.update(timestamp.encode(__salt_system_encoding__))
     signed = base64.b64encode(rsa_.sign(hash_))
     keyid = '/{0}/keys/{1}'.format(user.split('/')[0], ssh_keyname)
 
@@ -1085,7 +1085,7 @@ def query(action=None,
         'Date': timestamp,
         'Authorization': 'Signature keyId="{0}",algorithm="rsa-sha256" {1}'.format(
             keyid,
-            signed
+            signed.decode(__salt_system_encoding__)
         ),
     }