Jelajahi Sumber

HUE-8737 [core] Futurize desktop/libs/azure for Python 3.5

Ying Chen 6 tahun lalu
induk
melakukan
a29410d19d

+ 5 - 2
desktop/libs/azure/src/azure/abfs/abfs.py

@@ -18,10 +18,13 @@
 """
 Interfaces for ABFS
 """
+from future import standard_library
+standard_library.install_aliases()
+from builtins import object
 import logging
 import threading
 
-from urlparse import urlparse
+from urllib.parse import urlparse
 from hadoop.hdfs_site import get_umask_mode
 
 from hadoop.fs.exceptions import WebHdfsException
@@ -45,7 +48,7 @@ class ABFS(object):
                security_enabled=False,
                ssl_cert_ca_verify=True,
                temp_dir="/tmp",
-               umask=01022,
+               umask=0o1022,
                hdfs_supergroup=None,
                auth_provider=None):
     self._url = url

+ 1 - 0
desktop/libs/azure/src/azure/active_directory.py

@@ -15,6 +15,7 @@
 # limitations under the License.
 from __future__ import absolute_import
 
+from builtins import object
 import logging
 
 from time import time

+ 4 - 2
desktop/libs/azure/src/azure/adls/webhdfs.py

@@ -18,10 +18,12 @@
 """
 Interfaces for ADLS via HttpFs/WebHDFS
 """
+from future import standard_library
+standard_library.install_aliases()
 import logging
 import threading
 
-from urlparse import urlparse
+from urllib.parse import urlparse
 
 from hadoop.fs.webhdfs import WebHdfs as HadoopWebHdfs
 from hadoop.fs.exceptions import WebHdfsException
@@ -47,7 +49,7 @@ class WebHdfs(HadoopWebHdfs):
                security_enabled=False,
                ssl_cert_ca_verify=True,
                temp_dir="/tmp",
-               umask=01022,
+               umask=0o1022,
                hdfs_supergroup=None,
                auth_provider=None):
     self._url = url

+ 3 - 3
desktop/libs/azure/src/azure/client.py

@@ -49,13 +49,13 @@ def _init_clients():
   CLIENT_CACHE["azure"] = {}
   CLIENT_CACHE["adls"] = {}
   CLIENT_CACHE["abfs"] = {}
-  for identifier in conf.AZURE_ACCOUNTS.keys():
+  for identifier in list(conf.AZURE_ACCOUNTS.keys()):
     CLIENT_CACHE["azure"][identifier] = _make_azure_client(identifier)
 
-  for identifier in conf.ADLS_CLUSTERS.keys():
+  for identifier in list(conf.ADLS_CLUSTERS.keys()):
     CLIENT_CACHE["adls"][identifier] = _make_adls_client(identifier)
 
-  for identifier in conf.ABFS_CLUSTERS.keys():
+  for identifier in list(conf.ABFS_CLUSTERS.keys()):
     CLIENT_CACHE["abfs"][identifier] = _make_abfs_client(identifier)
 
 def _make_adls_client(identifier):

+ 3 - 3
desktop/libs/azure/src/azure/conf.py

@@ -142,10 +142,10 @@ ABFS_CLUSTERS = UnspecifiedConfigSection(
 )
 
 def is_adls_enabled():
-  return ('default' in AZURE_ACCOUNTS.keys() and AZURE_ACCOUNTS['default'].get_raw() and AZURE_ACCOUNTS['default'].CLIENT_ID.get() is not None and 'default' in ADLS_CLUSTERS.keys() and ADLS_CLUSTERS['default'].get_raw())
+  return ('default' in list(AZURE_ACCOUNTS.keys()) and AZURE_ACCOUNTS['default'].get_raw() and AZURE_ACCOUNTS['default'].CLIENT_ID.get() is not None and 'default' in list(ADLS_CLUSTERS.keys()) and ADLS_CLUSTERS['default'].get_raw())
 
 def is_abfs_enabled():
-  return ('default' in AZURE_ACCOUNTS.keys() and AZURE_ACCOUNTS['default'].get_raw() and AZURE_ACCOUNTS['default'].CLIENT_ID.get() is not None and 'default' in ABFS_CLUSTERS.keys() and ABFS_CLUSTERS['default'].get_raw())
+  return ('default' in list(AZURE_ACCOUNTS.keys()) and AZURE_ACCOUNTS['default'].get_raw() and AZURE_ACCOUNTS['default'].CLIENT_ID.get() is not None and 'default' in list(ABFS_CLUSTERS.keys()) and ABFS_CLUSTERS['default'].get_raw())
 
 def has_adls_access(user):
   from desktop.auth.backend import is_admin
@@ -165,7 +165,7 @@ def config_validator(user):
       headers = azure.client.get_client('default')._getheaders()
       if not headers.get('Authorization'):
         raise ValueError('Failed to obtain Azure authorization token')
-    except Exception, e:
+    except Exception as e:
       LOG.exception('Failed to obtain Azure authorization token.')
       res.append(('azure', _t('Failed to obtain Azure authorization token, check your azure configuration.')))