Browse Source

Fix code style

Bobholamovic 2 năm trước cách đây
mục cha
commit
d4d8ffe2dc
2 tập tin đã thay đổi với 30 bổ sung26 xóa
  1. 15 13
      paddlers/models/ppcls/utils/model_zoo.py
  2. 15 13
      paddlers/utils/download.py

+ 15 - 13
paddlers/models/ppcls/utils/model_zoo.py

@@ -151,26 +151,28 @@ def _decompress(fname):
 
     if fname.find('tar') >= 0:
         with tarfile.open(fname) as tf:
-            def is_within_directory(directory, target):
-                
+
+            def _is_within_directory(directory, target):
                 abs_directory = os.path.abspath(directory)
                 abs_target = os.path.abspath(target)
-            
+
                 prefix = os.path.commonprefix([abs_directory, abs_target])
-                
+
                 return prefix == abs_directory
-            
-            def safe_extract(tar, path=".", members=None, *, numeric_owner=False):
-            
+
+            def _safe_extract(tar,
+                              path=".",
+                              members=None,
+                              *,
+                              numeric_owner=False):
                 for member in tar.getmembers():
                     member_path = os.path.join(path, member.name)
-                    if not is_within_directory(path, member_path):
+                    if not _is_within_directory(path, member_path):
                         raise Exception("Attempted Path Traversal in Tar File")
-            
-                tar.extractall(path, members, numeric_owner=numeric_owner) 
-                
-            
-            safe_extract(tf, path=fpath_tmp)
+
+                tar.extractall(path, members, numeric_owner=numeric_owner)
+
+            _safe_extract(tf, path=fpath_tmp)
     elif fname.find('zip') >= 0:
         with zipfile.ZipFile(fname) as zf:
             zf.extractall(path=fpath_tmp)

+ 15 - 13
paddlers/utils/download.py

@@ -151,26 +151,28 @@ def decompress(fname):
 
     if fname.find('tar') >= 0 or fname.find('tgz') >= 0:
         with tarfile.open(fname) as tf:
-            def is_within_directory(directory, target):
-                
+
+            def _is_within_directory(directory, target):
                 abs_directory = os.path.abspath(directory)
                 abs_target = os.path.abspath(target)
-            
+
                 prefix = os.path.commonprefix([abs_directory, abs_target])
-                
+
                 return prefix == abs_directory
-            
-            def safe_extract(tar, path=".", members=None, *, numeric_owner=False):
-            
+
+            def _safe_extract(tar,
+                              path=".",
+                              members=None,
+                              *,
+                              numeric_owner=False):
                 for member in tar.getmembers():
                     member_path = os.path.join(path, member.name)
-                    if not is_within_directory(path, member_path):
+                    if not _is_within_directory(path, member_path):
                         raise Exception("Attempted Path Traversal in Tar File")
-            
-                tar.extractall(path, members, numeric_owner=numeric_owner) 
-                
-            
-            safe_extract(tf, path=fpath_tmp)
+
+                tar.extractall(path, members, numeric_owner=numeric_owner)
+
+            _safe_extract(tf, path=fpath_tmp)
     elif fname.find('zip') >= 0:
         with zipfile.ZipFile(fname) as zf:
             zf.extractall(path=fpath_tmp)