From 99dc6e0abff5727a81050b7f545193056e13f314 Mon Sep 17 00:00:00 2001 From: k3nny Date: Thu, 28 Nov 2024 23:46:48 +0100 Subject: [PATCH] fix import --- libtisbackup/XenAPI.py | 5 +++-- libtisbackup/backup_mysql.py | 2 ++ libtisbackup/backup_null.py | 3 ++- libtisbackup/backup_oracle.py | 7 +++++-- libtisbackup/backup_pgsql.py | 2 ++ libtisbackup/backup_rsync.py | 10 ++++----- libtisbackup/backup_rsync_btrfs.py | 9 ++++----- libtisbackup/backup_samba4.py | 2 ++ libtisbackup/backup_sqlserver.py | 5 ++++- libtisbackup/backup_switch.py | 29 +++++++++++++++------------ libtisbackup/backup_vmdk.py | 20 +++++++++--------- libtisbackup/backup_xcp_metadata.py | 4 +++- libtisbackup/backup_xva.py | 19 ++++++++++-------- libtisbackup/common.py | 20 +++++++++--------- libtisbackup/copy_vm_xcp.py | 28 ++++++++++++++------------ libtisbackup/iniparse/__init__.py | 16 +++++++-------- libtisbackup/iniparse/compat.py | 19 ++++++++---------- libtisbackup/iniparse/configparser.py | 2 +- libtisbackup/iniparse/ini.py | 2 +- libtisbackup/iniparse/utils.py | 2 +- 20 files changed, 112 insertions(+), 94 deletions(-) diff --git a/libtisbackup/XenAPI.py b/libtisbackup/XenAPI.py index 93840ad..64d3ada 100644 --- a/libtisbackup/XenAPI.py +++ b/libtisbackup/XenAPI.py @@ -55,11 +55,12 @@ # -------------------------------------------------------------------- import gettext -import six.moves.xmlrpc_client as xmlrpclib -import six.moves.http_client as httplib import socket import sys +import six.moves.http_client as httplib +import six.moves.xmlrpc_client as xmlrpclib + translation = gettext.translation('xen-xm', fallback = True) API_VERSION_1_1 = '1.1' diff --git a/libtisbackup/backup_mysql.py b/libtisbackup/backup_mysql.py index 69446d0..20e9cef 100644 --- a/libtisbackup/backup_mysql.py +++ b/libtisbackup/backup_mysql.py @@ -21,6 +21,7 @@ import sys + try: sys.stderr = open('/dev/null') # Silence silly warnings from paramiko import paramiko @@ -32,6 +33,7 @@ sys.stderr = sys.__stderr__ from libtisbackup.common import * + class backup_mysql(backup_generic): """Backup a mysql database as gzipped sql file through ssh""" type = 'mysql+ssh' diff --git a/libtisbackup/backup_null.py b/libtisbackup/backup_null.py index 15b8a57..ede819b 100755 --- a/libtisbackup/backup_null.py +++ b/libtisbackup/backup_null.py @@ -18,8 +18,9 @@ # # ----------------------------------------------------------------------- -import os import datetime +import os + from .common import * diff --git a/libtisbackup/backup_oracle.py b/libtisbackup/backup_oracle.py index cb76b16..d3b2efc 100644 --- a/libtisbackup/backup_oracle.py +++ b/libtisbackup/backup_oracle.py @@ -18,6 +18,7 @@ # # ----------------------------------------------------------------------- import sys + try: sys.stderr = open('/dev/null') # Silence silly warnings from paramiko import paramiko @@ -27,12 +28,14 @@ except ImportError as e: sys.stderr = sys.__stderr__ -import datetime import base64 +import datetime import os -from libtisbackup.common import * import re +from libtisbackup.common import * + + class backup_oracle(backup_generic): """Backup a oracle database as zipped file through ssh""" type = 'oracle+ssh' diff --git a/libtisbackup/backup_pgsql.py b/libtisbackup/backup_pgsql.py index 41983d3..10590dd 100644 --- a/libtisbackup/backup_pgsql.py +++ b/libtisbackup/backup_pgsql.py @@ -18,6 +18,7 @@ # # ----------------------------------------------------------------------- import sys + try: sys.stderr = open('/dev/null') # Silence silly warnings from paramiko import paramiko @@ -29,6 +30,7 @@ sys.stderr = sys.__stderr__ from .common import * + class backup_pgsql(backup_generic): """Backup a postgresql database as gzipped sql file through ssh""" type = 'pgsql+ssh' diff --git a/libtisbackup/backup_rsync.py b/libtisbackup/backup_rsync.py index 72a5cfc..35766d2 100644 --- a/libtisbackup/backup_rsync.py +++ b/libtisbackup/backup_rsync.py @@ -18,14 +18,14 @@ # # ----------------------------------------------------------------------- -import os import datetime -from libtisbackup.common import * -import time import logging -import re +import os import os.path -import datetime +import re +import time + +from libtisbackup.common import * class backup_rsync(backup_generic): diff --git a/libtisbackup/backup_rsync_btrfs.py b/libtisbackup/backup_rsync_btrfs.py index 8bd3a27..69bf47f 100644 --- a/libtisbackup/backup_rsync_btrfs.py +++ b/libtisbackup/backup_rsync_btrfs.py @@ -18,14 +18,13 @@ # # ----------------------------------------------------------------------- -import os import datetime -from .common import * -import time import logging -import re +import os import os.path -import datetime +import re +import time + from .common import * diff --git a/libtisbackup/backup_samba4.py b/libtisbackup/backup_samba4.py index d716868..fd3a0ba 100644 --- a/libtisbackup/backup_samba4.py +++ b/libtisbackup/backup_samba4.py @@ -21,6 +21,7 @@ import sys + try: sys.stderr = open('/dev/null') # Silence silly warnings from paramiko import paramiko @@ -32,6 +33,7 @@ sys.stderr = sys.__stderr__ from .common import * + class backup_samba4(backup_generic): """Backup a samba4 databases as gzipped tdbs file through ssh""" type = 'samba4' diff --git a/libtisbackup/backup_sqlserver.py b/libtisbackup/backup_sqlserver.py index 9c1cb9d..3207d40 100644 --- a/libtisbackup/backup_sqlserver.py +++ b/libtisbackup/backup_sqlserver.py @@ -21,6 +21,7 @@ import sys + try: sys.stderr = open('/dev/null') # Silence silly warnings from paramiko import paramiko @@ -30,11 +31,13 @@ except ImportError as e: sys.stderr = sys.__stderr__ -import datetime import base64 +import datetime import os + from .common import * + class backup_sqlserver(backup_generic): """Backup a SQLSERVER database as gzipped sql file through ssh""" type = 'sqlserver+ssh' diff --git a/libtisbackup/backup_switch.py b/libtisbackup/backup_switch.py index a5d11a1..cae089a 100644 --- a/libtisbackup/backup_switch.py +++ b/libtisbackup/backup_switch.py @@ -18,23 +18,26 @@ # # ----------------------------------------------------------------------- -import os -import datetime -from .common import * -from . import XenAPI -import time -import logging -import re -import os.path -import datetime -import select -import urllib.request, urllib.error, urllib.parse, urllib.request, urllib.parse, urllib.error import base64 +import datetime +import logging +import os +import os.path +import re +import select import socket -import requests -import pexpect +import time +import urllib.error +import urllib.parse +import urllib.request from stat import * +import pexpect +import requests + +from . import XenAPI +from .common import * + class backup_switch(backup_generic): """Backup a startup-config on a switch""" diff --git a/libtisbackup/backup_vmdk.py b/libtisbackup/backup_vmdk.py index 434d66d..2be96db 100755 --- a/libtisbackup/backup_vmdk.py +++ b/libtisbackup/backup_vmdk.py @@ -18,25 +18,25 @@ # # ----------------------------------------------------------------------- -from .common import * -import pyVmomi -from pyVmomi import vim -from pyVmomi import vmodl -from pyVim.connect import SmartConnect, Disconnect - -from datetime import datetime, date, timedelta import atexit import getpass +from datetime import date, datetime, timedelta + +import pyVmomi import requests +from pyVim.connect import Disconnect, SmartConnect +from pyVmomi import vim, vmodl # Disable HTTPS verification warnings. from requests.packages import urllib3 + +from .common import * + urllib3.disable_warnings() import os -import time +import re import tarfile -import re +import time import xml.etree.ElementTree as ET - from stat import * diff --git a/libtisbackup/backup_xcp_metadata.py b/libtisbackup/backup_xcp_metadata.py index da125ee..e8ac799 100644 --- a/libtisbackup/backup_xcp_metadata.py +++ b/libtisbackup/backup_xcp_metadata.py @@ -20,9 +20,11 @@ -from .common import * import paramiko +from .common import * + + class backup_xcp_metadata(backup_generic): """Backup metatdata of a xcp pool using xe pool-dump-database""" type = 'xcp-dump-metadata' diff --git a/libtisbackup/backup_xva.py b/libtisbackup/backup_xva.py index d91634d..24abdd8 100755 --- a/libtisbackup/backup_xva.py +++ b/libtisbackup/backup_xva.py @@ -18,20 +18,23 @@ # # ----------------------------------------------------------------------- -import logging -import re -import os import datetime -import urllib.request, urllib.parse, urllib.error -import socket -import tarfile import hashlib -from stat import * +import logging +import os +import re +import socket import ssl +import tarfile +import urllib.error +import urllib.parse +import urllib.request +from stat import * + import requests -from .common import * from . import XenAPI +from .common import * if hasattr(ssl, '_create_unverified_context'): ssl._create_default_https_context = ssl._create_unverified_context diff --git a/libtisbackup/common.py b/libtisbackup/common.py index 25a1832..b91cdc0 100644 --- a/libtisbackup/common.py +++ b/libtisbackup/common.py @@ -18,19 +18,19 @@ # # ----------------------------------------------------------------------- -from abc import ABC, abstractmethod -import os -import subprocess -import re -import logging import datetime -import time -from iniparse import ConfigParser -import sqlite3 -import shutil +import logging +import os +import re import select - +import shutil +import sqlite3 +import subprocess import sys +import time +from abc import ABC, abstractmethod + +from iniparse import ConfigParser try: sys.stderr = open('/dev/null') # Silence silly warnings from paramiko diff --git a/libtisbackup/copy_vm_xcp.py b/libtisbackup/copy_vm_xcp.py index 64acc17..9f4dedd 100755 --- a/libtisbackup/copy_vm_xcp.py +++ b/libtisbackup/copy_vm_xcp.py @@ -18,22 +18,24 @@ # # ----------------------------------------------------------------------- -import os -import datetime -from .common import * -from . import XenAPI -import time -import logging -import re -import os.path -import os -import datetime -import select -import urllib.request, urllib.error, urllib.parse import base64 +import datetime +import logging +import os +import os.path +import re +import select import socket +import ssl +import time +import urllib.error +import urllib.parse +import urllib.request from stat import * -import ssl + +from . import XenAPI +from .common import * + if hasattr(ssl, '_create_unverified_context'): ssl._create_default_https_context = ssl._create_unverified_context diff --git a/libtisbackup/iniparse/__init__.py b/libtisbackup/iniparse/__init__.py index 7193f92..ff3b446 100644 --- a/libtisbackup/iniparse/__init__.py +++ b/libtisbackup/iniparse/__init__.py @@ -3,18 +3,16 @@ # Copyright (c) 2007 Tim Lauridsen # All Rights Reserved. See LICENSE-PSF & LICENSE for details. -from .ini import INIConfig, change_comment_syntax +from .compat import ConfigParser, RawConfigParser, SafeConfigParser from .config import BasicConfig, ConfigNamespace -from .compat import RawConfigParser, ConfigParser, SafeConfigParser +from .configparser import (DEFAULTSECT, MAX_INTERPOLATION_DEPTH, + DuplicateSectionError, InterpolationDepthError, + InterpolationMissingOptionError, + InterpolationSyntaxError, NoOptionError, + NoSectionError) +from .ini import INIConfig, change_comment_syntax from .utils import tidy -from .configparser import DuplicateSectionError, \ - NoSectionError, NoOptionError, \ - InterpolationMissingOptionError, \ - InterpolationDepthError, \ - InterpolationSyntaxError, \ - DEFAULTSECT, MAX_INTERPOLATION_DEPTH - __all__ = [ 'BasicConfig', 'ConfigNamespace', 'INIConfig', 'tidy', 'change_comment_syntax', diff --git a/libtisbackup/iniparse/compat.py b/libtisbackup/iniparse/compat.py index 76eb1ea..676cb76 100644 --- a/libtisbackup/iniparse/compat.py +++ b/libtisbackup/iniparse/compat.py @@ -12,21 +12,18 @@ The underlying INIConfig object can be accessed as cfg.data """ import re -from .configparser import DuplicateSectionError, \ - NoSectionError, NoOptionError, \ - InterpolationMissingOptionError, \ - InterpolationDepthError, \ - InterpolationSyntaxError, \ - DEFAULTSECT, MAX_INTERPOLATION_DEPTH - -# These are imported only for compatiability. -# The code below does not reference them directly. -from .configparser import Error, InterpolationError, \ - MissingSectionHeaderError, ParsingError import six from . import ini +# These are imported only for compatiability. +# The code below does not reference them directly. +from .configparser import (DEFAULTSECT, MAX_INTERPOLATION_DEPTH, + DuplicateSectionError, Error, + InterpolationDepthError, InterpolationError, + InterpolationMissingOptionError, + InterpolationSyntaxError, MissingSectionHeaderError, + NoOptionError, NoSectionError, ParsingError) class RawConfigParser(object): diff --git a/libtisbackup/iniparse/configparser.py b/libtisbackup/iniparse/configparser.py index c543d50..4664220 100644 --- a/libtisbackup/iniparse/configparser.py +++ b/libtisbackup/iniparse/configparser.py @@ -1,6 +1,6 @@ try: - from ConfigParser import * # not all objects get imported with __all__ + from ConfigParser import * from ConfigParser import Error, InterpolationMissingOptionError except ImportError: from configparser import * diff --git a/libtisbackup/iniparse/ini.py b/libtisbackup/iniparse/ini.py index dc47621..9819ac3 100644 --- a/libtisbackup/iniparse/ini.py +++ b/libtisbackup/iniparse/ini.py @@ -42,11 +42,11 @@ Example: # Backward-compatiable with ConfigParser import re -from .configparser import DEFAULTSECT, ParsingError, MissingSectionHeaderError import six from . import config +from .configparser import DEFAULTSECT, MissingSectionHeaderError, ParsingError class LineType(object): diff --git a/libtisbackup/iniparse/utils.py b/libtisbackup/iniparse/utils.py index ee5e40d..9a4cec7 100644 --- a/libtisbackup/iniparse/utils.py +++ b/libtisbackup/iniparse/utils.py @@ -1,5 +1,5 @@ from . import compat -from .ini import LineContainer, EmptyLine +from .ini import EmptyLine, LineContainer def tidy(cfg):