mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-03-01 09:17:02 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7135 from ThomasWaldmann/remove-py37-compat-code-1.2

Browse source 
remove python < 3.7 compatibility code
This commit is contained in:
TW 2022-11-07 09:04:37 +01:00 committed by GitHub
commit 97261dbb22
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/borg/helpers/fs.py
View file

@ -18,9 +18,6 @@
logger = create_logger() 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): 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. Ensures that the dir exists with the right permissions.
@ -184,8 +181,7 @@ def scandir_keyfunc(dirent):
def scandir_inorder(*, path, fd=None): 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 else path
arg = fd if fd is not None and py_37_plus else path
return sorted(os.scandir(arg), key=scandir_keyfunc) return sorted(os.scandir(arg), key=scandir_keyfunc)