mirror of
https://github.com/borgbackup/borg.git
synced 2025-02-25 15:33:39 +00:00
Merge pull request #7134 from ThomasWaldmann/remove-py37-compat-code-master
remove python < 3.7 compatibility code
This commit is contained in:
commit
31c53f6b78
1 changed files with 1 additions and 5 deletions
|
@ -20,9 +20,6 @@
|
|||
logger = create_logger()
|
||||
|
||||
|
||||
py_37_plus = sys.version_info >= (3, 7)
|
||||
|
||||
|
||||
def ensure_dir(path, mode=stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO, pretty_deadly=True):
|
||||
"""
|
||||
Ensures that the dir exists with the right permissions.
|
||||
|
@ -259,8 +256,7 @@ def scandir_keyfunc(dirent):
|
|||
|
||||
|
||||
def scandir_inorder(*, path, fd=None):
|
||||
# py37+ supports giving an fd instead of a path (no full entry.path in DirEntry in that case!)
|
||||
arg = fd if fd is not None and py_37_plus else path
|
||||
arg = fd if fd is not None else path
|
||||
return sorted(os.scandir(arg), key=scandir_keyfunc)
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue