From 8c1058a8083028f41159e62fcdcd723fa4099417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Bidoul?= Date: Tue, 21 Sep 2021 14:05:33 +0200 Subject: [PATCH] Use relative imports --- zfs_autobackup/ExecuteNode.py | 4 ++-- zfs_autobackup/Thinner.py | 2 +- zfs_autobackup/ZfsAutobackup.py | 14 +++++++------- zfs_autobackup/ZfsDataset.py | 4 ++-- zfs_autobackup/ZfsNode.py | 12 ++++++------ zfs_autobackup/ZfsPool.py | 2 +- zfs_autobackup/__init__.py | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/zfs_autobackup/ExecuteNode.py b/zfs_autobackup/ExecuteNode.py index ae0d8be..c5743a3 100644 --- a/zfs_autobackup/ExecuteNode.py +++ b/zfs_autobackup/ExecuteNode.py @@ -1,8 +1,8 @@ import os import select import subprocess -from zfs_autobackup.CmdPipe import CmdPipe, CmdItem -from zfs_autobackup.LogStub import LogStub +from .CmdPipe import CmdPipe, CmdItem +from .LogStub import LogStub try: from shlex import quote as cmd_quote diff --git a/zfs_autobackup/Thinner.py b/zfs_autobackup/Thinner.py index d85b260..1f5cfb3 100644 --- a/zfs_autobackup/Thinner.py +++ b/zfs_autobackup/Thinner.py @@ -1,6 +1,6 @@ import time -from zfs_autobackup.ThinnerRule import ThinnerRule +from .ThinnerRule import ThinnerRule class Thinner: diff --git a/zfs_autobackup/ZfsAutobackup.py b/zfs_autobackup/ZfsAutobackup.py index 3c72071..06de719 100644 --- a/zfs_autobackup/ZfsAutobackup.py +++ b/zfs_autobackup/ZfsAutobackup.py @@ -2,13 +2,13 @@ import argparse import sys import time -from zfs_autobackup import compressors -from zfs_autobackup.ExecuteNode import ExecuteNode -from zfs_autobackup.Thinner import Thinner -from zfs_autobackup.ZfsDataset import ZfsDataset -from zfs_autobackup.LogConsole import LogConsole -from zfs_autobackup.ZfsNode import ZfsNode -from zfs_autobackup.ThinnerRule import ThinnerRule +from . import compressors +from .ExecuteNode import ExecuteNode +from .Thinner import Thinner +from .ZfsDataset import ZfsDataset +from .LogConsole import LogConsole +from .ZfsNode import ZfsNode +from .ThinnerRule import ThinnerRule class ZfsAutobackup: diff --git a/zfs_autobackup/ZfsDataset.py b/zfs_autobackup/ZfsDataset.py index 83e8e91..44b8035 100644 --- a/zfs_autobackup/ZfsDataset.py +++ b/zfs_autobackup/ZfsDataset.py @@ -1,8 +1,8 @@ import re import time -from zfs_autobackup.CachedProperty import CachedProperty -from zfs_autobackup.ExecuteNode import ExecuteError +from .CachedProperty import CachedProperty +from .ExecuteNode import ExecuteError class ZfsDataset: diff --git a/zfs_autobackup/ZfsNode.py b/zfs_autobackup/ZfsNode.py index 937f20a..b738bb3 100644 --- a/zfs_autobackup/ZfsNode.py +++ b/zfs_autobackup/ZfsNode.py @@ -6,12 +6,12 @@ import subprocess import sys import time -from zfs_autobackup.ExecuteNode import ExecuteNode -from zfs_autobackup.Thinner import Thinner -from zfs_autobackup.CachedProperty import CachedProperty -from zfs_autobackup.ZfsPool import ZfsPool -from zfs_autobackup.ZfsDataset import ZfsDataset -from zfs_autobackup.ExecuteNode import ExecuteError +from .ExecuteNode import ExecuteNode +from .Thinner import Thinner +from .CachedProperty import CachedProperty +from .ZfsPool import ZfsPool +from .ZfsDataset import ZfsDataset +from .ExecuteNode import ExecuteError class ZfsNode(ExecuteNode): diff --git a/zfs_autobackup/ZfsPool.py b/zfs_autobackup/ZfsPool.py index c02c973..11976ab 100644 --- a/zfs_autobackup/ZfsPool.py +++ b/zfs_autobackup/ZfsPool.py @@ -1,4 +1,4 @@ -from zfs_autobackup.CachedProperty import CachedProperty +from .CachedProperty import CachedProperty class ZfsPool(): diff --git a/zfs_autobackup/__init__.py b/zfs_autobackup/__init__.py index 361b857..de29084 100755 --- a/zfs_autobackup/__init__.py +++ b/zfs_autobackup/__init__.py @@ -3,7 +3,7 @@ def cli(): import sys - from zfs_autobackup.ZfsAutobackup import ZfsAutobackup + from .ZfsAutobackup import ZfsAutobackup zfs_autobackup = ZfsAutobackup(sys.argv[1:], False) sys.exit(zfs_autobackup.run())