[PATCH 08/12] Accommodate and enable pylint consider-using-from-import

[Rob Browning]

Signed-off-by: Rob Browning <r...@defaultvalue.org>
Tested-by: Rob Browning <r...@defaultvalue.org>
---
.pylintrc | 1 +
lib/bup/cmd/split.py | 2 +-
lib/bup/drecurse.py | 3 ++-
lib/bup/version.py | 2 +-
test/int/test_index.py | 3 +--
test/int/test_metadata.py | 3 +--
6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index 84611d17..689e0e02 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -21,6 +21,7 @@ enable=
consider-iterating-dictionary,
consider-using-dict-items,
consider-using-enumerate,
+ consider-using-from-import,
consider-using-generator,
consider-using-in,
consider-using-max-builtin,
diff --git a/lib/bup/cmd/split.py b/lib/bup/cmd/split.py
index 3eeccc74..17aeacf5 100644
--- a/lib/bup/cmd/split.py
+++ b/lib/bup/cmd/split.py
@@ -4,7 +4,7 @@ from functools import partial
from os import environb as environ
import os, sys, time

-from bup import compat, hashsplit, git, options, client
+from bup import client, compat, git, hashsplit, options
from bup.commit import commit_message
from bup.compat import argv_bytes
from bup.config import ConfigError, derive_repo_addr
diff --git a/lib/bup/drecurse.py b/lib/bup/drecurse.py
index 9d790bbd..bf037abd 100644
--- a/lib/bup/drecurse.py
+++ b/lib/bup/drecurse.py
@@ -7,8 +7,9 @@ from bup.helpers \
finalized,
resolve_parent,
should_rx_exclude_path)
+from bup import xstat
from bup.io import path_msg
-import bup.xstat as xstat
+

# the use of fchdir() and lstat() is for two reasons:
# - help out the kernel by not making it repeatedly look up the absolute path
diff --git a/lib/bup/version.py b/lib/bup/version.py
index dbbe6fe3..3333e2a0 100644
--- a/lib/bup/version.py
+++ b/lib/bup/version.py
@@ -2,7 +2,7 @@

from bup import source_info
try:
- import bup.checkout_info as checkout_info
+ from bup import checkout_info
except ImportError:
checkout_info = None

diff --git a/test/int/test_index.py b/test/int/test_index.py
index 030a986b..38dc0dd7 100644
--- a/test/int/test_index.py
+++ b/test/int/test_index.py
@@ -3,10 +3,9 @@ import os, time

from wvpytest import *

-from bup import index, metadata
+from bup import index, metadata, xstat
from bup.compat import fsencode
from bup.helpers import resolve_parent
-import bup.xstat as xstat


lib_t_dir = os.path.dirname(fsencode(__file__))
diff --git a/test/int/test_metadata.py b/test/int/test_metadata.py
index 811e8dcb..d9f626d1 100644
--- a/test/int/test_metadata.py
+++ b/test/int/test_metadata.py
@@ -5,14 +5,13 @@ import pytest

from wvpytest import *

-from bup import git, metadata
+from bup import git, helpers, metadata
from bup import vfs
from bup.compat import fsencode
from bup.helpers import clear_errors, detect_fakeroot, is_superuser, resolve_parent
from bup.metadata import xattr
from bup.repo import LocalRepo
from bup.xstat import utime, lutime
-import bup.helpers as helpers
import buptest

lib_t_dir = os.path.dirname(fsencode(__file__))
--
2.47.3