Merge pull request #98 from sbidoul/relative-imports
Use relative imports
This commit is contained in:
@ -1,8 +1,8 @@
|
|||||||
import os
|
import os
|
||||||
import select
|
import select
|
||||||
import subprocess
|
import subprocess
|
||||||
from zfs_autobackup.CmdPipe import CmdPipe, CmdItem
|
from .CmdPipe import CmdPipe, CmdItem
|
||||||
from zfs_autobackup.LogStub import LogStub
|
from .LogStub import LogStub
|
||||||
|
|
||||||
try:
|
try:
|
||||||
from shlex import quote as cmd_quote
|
from shlex import quote as cmd_quote
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
import time
|
import time
|
||||||
|
|
||||||
from zfs_autobackup.ThinnerRule import ThinnerRule
|
from .ThinnerRule import ThinnerRule
|
||||||
|
|
||||||
|
|
||||||
class Thinner:
|
class Thinner:
|
||||||
|
|||||||
@ -2,13 +2,13 @@ import argparse
|
|||||||
import sys
|
import sys
|
||||||
import time
|
import time
|
||||||
|
|
||||||
from zfs_autobackup import compressors
|
from . import compressors
|
||||||
from zfs_autobackup.ExecuteNode import ExecuteNode
|
from .ExecuteNode import ExecuteNode
|
||||||
from zfs_autobackup.Thinner import Thinner
|
from .Thinner import Thinner
|
||||||
from zfs_autobackup.ZfsDataset import ZfsDataset
|
from .ZfsDataset import ZfsDataset
|
||||||
from zfs_autobackup.LogConsole import LogConsole
|
from .LogConsole import LogConsole
|
||||||
from zfs_autobackup.ZfsNode import ZfsNode
|
from .ZfsNode import ZfsNode
|
||||||
from zfs_autobackup.ThinnerRule import ThinnerRule
|
from .ThinnerRule import ThinnerRule
|
||||||
|
|
||||||
|
|
||||||
class ZfsAutobackup:
|
class ZfsAutobackup:
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
import re
|
import re
|
||||||
import time
|
import time
|
||||||
|
|
||||||
from zfs_autobackup.CachedProperty import CachedProperty
|
from .CachedProperty import CachedProperty
|
||||||
from zfs_autobackup.ExecuteNode import ExecuteError
|
from .ExecuteNode import ExecuteError
|
||||||
|
|
||||||
|
|
||||||
class ZfsDataset:
|
class ZfsDataset:
|
||||||
|
|||||||
@ -6,12 +6,12 @@ import subprocess
|
|||||||
import sys
|
import sys
|
||||||
import time
|
import time
|
||||||
|
|
||||||
from zfs_autobackup.ExecuteNode import ExecuteNode
|
from .ExecuteNode import ExecuteNode
|
||||||
from zfs_autobackup.Thinner import Thinner
|
from .Thinner import Thinner
|
||||||
from zfs_autobackup.CachedProperty import CachedProperty
|
from .CachedProperty import CachedProperty
|
||||||
from zfs_autobackup.ZfsPool import ZfsPool
|
from .ZfsPool import ZfsPool
|
||||||
from zfs_autobackup.ZfsDataset import ZfsDataset
|
from .ZfsDataset import ZfsDataset
|
||||||
from zfs_autobackup.ExecuteNode import ExecuteError
|
from .ExecuteNode import ExecuteError
|
||||||
|
|
||||||
|
|
||||||
class ZfsNode(ExecuteNode):
|
class ZfsNode(ExecuteNode):
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
from zfs_autobackup.CachedProperty import CachedProperty
|
from .CachedProperty import CachedProperty
|
||||||
|
|
||||||
|
|
||||||
class ZfsPool():
|
class ZfsPool():
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
def cli():
|
def cli():
|
||||||
import sys
|
import sys
|
||||||
from zfs_autobackup.ZfsAutobackup import ZfsAutobackup
|
from .ZfsAutobackup import ZfsAutobackup
|
||||||
|
|
||||||
zfs_autobackup = ZfsAutobackup(sys.argv[1:], False)
|
zfs_autobackup = ZfsAutobackup(sys.argv[1:], False)
|
||||||
sys.exit(zfs_autobackup.run())
|
sys.exit(zfs_autobackup.run())
|
||||||
|
|||||||
Reference in New Issue
Block a user