Browse Source

[hdfs] Fix Python styling

Romain Rigaux 4 years ago
parent
commit
4960b23407
2 changed files with 37 additions and 35 deletions
  1. 5 3
      desktop/libs/hadoop/src/hadoop/conf.py
  2. 32 32
      desktop/libs/hadoop/src/hadoop/fs/webhdfs.py

+ 5 - 3
desktop/libs/hadoop/src/hadoop/conf.py

@@ -76,7 +76,7 @@ HDFS_CLUSTERS = UnspecifiedConfigSection(
           help="The equivalent of fs.defaultFS (aka fs.default.name)",
           default="hdfs://localhost:8020"
       ),
-      LOGICAL_NAME = Config(
+      LOGICAL_NAME=Config(
           "logical_name",
           default="",
           type=str,
@@ -117,10 +117,12 @@ HDFS_CLUSTERS = UnspecifiedConfigSection(
           default='/tmp',
           type=str
       ),
-      HADOOP_CONF_DIR = Config(
+      HADOOP_CONF_DIR=Config(
           key="hadoop_conf_dir",
           dynamic_default=get_hadoop_conf_dir_default,
-          help="Directory of the Hadoop configuration) Defaults to the environment variable HADOOP_CONF_DIR when set, or '/etc/hadoop/conf'."
+          help=
+            "Directory of the Hadoop configuration) Defaults to the environment variable HADOOP_CONF_DIR when set, "
+            "or '/etc/hadoop/conf'."
       ),
       IS_ENABLED=Config(
           'is_enabled',

+ 32 - 32
desktop/libs/hadoop/src/hadoop/fs/webhdfs.py

@@ -212,8 +212,8 @@ class WebHdfs(Hdfs):
 
   def _getparams(self):
     return {
-      "user.name" : WebHdfs.DEFAULT_USER,
-      "doas" : self.user
+      "user.name": WebHdfs.DEFAULT_USER,
+      "doas": self.user
     }
 
   def _getheaders(self):
@@ -246,7 +246,7 @@ class WebHdfs(Hdfs):
     #fs_normpath clears scheme:/ to scheme: which doesn't make sense
     split = urlparse(path)
     if not split.path:
-        path = split._replace(path="/").geturl()
+      path = split._replace(path="/").geturl()
     return path
 
   def netnormpath(self, path):
@@ -273,7 +273,7 @@ class WebHdfs(Hdfs):
     headers = self._getheaders()
     json = self._root.get(path, params, headers)
     filestatus_list = json['FileStatuses']['FileStatus']
-    return [ WebHdfsStat(st, path) for st in filestatus_list ]
+    return [WebHdfsStat(st, path) for st in filestatus_list]
 
   def listdir(self, path, glob=None):
     """
@@ -660,45 +660,45 @@ class WebHdfs(Hdfs):
 
 
   def remove_acl_entries(self, path, aclspec):
-      path = self.strip_normpath(path)
-      params = self._getparams()
-      params['op'] = 'REMOVEACLENTRIES'
-      params['aclspec'] = aclspec
-      headers = self._getheaders()
-      return self._root.put(path, params, headers=headers)
+    path = self.strip_normpath(path)
+    params = self._getparams()
+    params['op'] = 'REMOVEACLENTRIES'
+    params['aclspec'] = aclspec
+    headers = self._getheaders()
+    return self._root.put(path, params, headers=headers)
 
 
   def remove_default_acl(self, path):
-      path = self.strip_normpath(path)
-      params = self._getparams()
-      params['op'] = 'REMOVEDEFAULTACL'
-      headers = self._getheaders()
-      return self._root.put(path, params, headers=headers)
+    path = self.strip_normpath(path)
+    params = self._getparams()
+    params['op'] = 'REMOVEDEFAULTACL'
+    headers = self._getheaders()
+    return self._root.put(path, params, headers=headers)
 
 
   def remove_acl(self, path):
-      path = self.strip_normpath(path)
-      params = self._getparams()
-      params['op'] = 'REMOVEACL'
-      headers = self._getheaders()
-      return self._root.put(path, params, headers=headers)
+    path = self.strip_normpath(path)
+    params = self._getparams()
+    params['op'] = 'REMOVEACL'
+    headers = self._getheaders()
+    return self._root.put(path, params, headers=headers)
 
 
   def set_acl(self, path, aclspec):
-      path = self.strip_normpath(path)
-      params = self._getparams()
-      params['op'] = 'SETACL'
-      params['aclspec'] = aclspec
-      headers = self._getheaders()
-      return self._root.put(path, params, headers=headers)
+    path = self.strip_normpath(path)
+    params = self._getparams()
+    params['op'] = 'SETACL'
+    params['aclspec'] = aclspec
+    headers = self._getheaders()
+    return self._root.put(path, params, headers=headers)
 
 
   def get_acl_status(self, path):
-      path = self.strip_normpath(path)
-      params = self._getparams()
-      params['op'] = 'GETACLSTATUS'
-      headers = self._getheaders()
-      return self._root.get(path, params, headers=headers)
+    path = self.strip_normpath(path)
+    params = self._getparams()
+    params['op'] = 'GETACLSTATUS'
+    headers = self._getheaders()
+    return self._root.get(path, params, headers=headers)
 
 
   def check_access(self, path, aclspec='rw-'):
@@ -801,7 +801,7 @@ class WebHdfs(Hdfs):
     # changed below for directories to remain consistent
     if dir_mode is None:
       sb = self._stats(src)
-      dir_mode=oct(stat.S_IMODE(sb.mode))
+      dir_mode = oct(stat.S_IMODE(sb.mode))
 
     src = self.strip_normpath(src)
     dest = self.strip_normpath(dest)