Review changes (squash this commit please).

Author: dhermes

gcloud/credentials.py

@@ -188,10 +188,9 @@ def _get_pem_key(credentials):
                          'not a valid service account credentials type'))
 
     if crypto is None:
-        raise EnvironmentError('pyOpenSSL must be installed to load a '
-                               'private key')
-    else:
-        return crypto.load_privatekey(crypto.FILETYPE_PEM, pem_text)
+        raise EnvironmentError(
+            'pyOpenSSL must be installed to load a private key')
+    return crypto.load_privatekey(crypto.FILETYPE_PEM, pem_text)
 
 
 def _get_signature_bytes(credentials, string_to_sign):
@@ -221,8 +220,7 @@ def _get_signature_bytes(credentials, string_to_sign):
         if crypto is None:
             raise EnvironmentError('pyOpenSSL must be installed to sign '
                                    'content using a private key')
-        else:
-            return crypto.sign(pkey, string_to_sign, 'SHA256')
+        return crypto.sign(pkey, string_to_sign, 'SHA256')
 
 
 def _get_service_account_name(credentials):