From c380d918052574091a007cd07e571edc0469762e Mon Sep 17 00:00:00 2001 From: Marian Beermann Date: Mon, 14 Nov 2016 21:50:20 +0100 Subject: [PATCH] fixes for flake 3.1.1 --- setup.py | 1 + src/borg/helpers.py | 2 ++ src/borg/platform/base.py | 1 + tox.ini | 2 +- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 92588ef7..64882457 100644 --- a/setup.py +++ b/setup.py @@ -136,6 +136,7 @@ def detect_libb2(prefixes): if 'blake2b_init' in fd.read(): return prefix + include_dirs = [] library_dirs = [] define_macros = [] diff --git a/src/borg/helpers.py b/src/borg/helpers.py index ab2e1271..0898a454 100644 --- a/src/borg/helpers.py +++ b/src/borg/helpers.py @@ -672,6 +672,7 @@ def replace_placeholders(text): } return format_line(text, data) + PrefixSpec = replace_placeholders @@ -1669,6 +1670,7 @@ def scandir_generic(path='.'): for name in sorted(os.listdir(path)): yield GenericDirEntry(path, name) + try: from os import scandir except ImportError: diff --git a/src/borg/platform/base.py b/src/borg/platform/base.py index 496a59b5..d024ce76 100644 --- a/src/borg/platform/base.py +++ b/src/borg/platform/base.py @@ -34,6 +34,7 @@ def acl_set(path, item, numeric_owner=False): of the user/group names """ + try: from os import lchflags diff --git a/tox.ini b/tox.ini index bcd560c5..5aa14a50 100644 --- a/tox.ini +++ b/tox.ini @@ -16,4 +16,4 @@ passenv = * [testenv:flake8] changedir = deps = flake8 -commands = flake8 +commands = flake8 src scripts conftest.py