fixed some imports

This commit is contained in:
Rob Weber 2019-08-27 14:55:22 -05:00
parent 1f0e262c5b
commit 72c77fb33a
7 changed files with 15 additions and 16 deletions

View File

@ -1,8 +1,8 @@
import json import json
import utils as utils
import xbmcvfs import xbmcvfs
import xbmc import xbmc
import xbmcgui import xbmcgui
from . import utils as utils
class BackupSetManager: class BackupSetManager:
jsonFile = xbmc.translatePath(utils.data_dir() + "custom_paths.json") jsonFile = xbmc.translatePath(utils.data_dir() + "custom_paths.json")
@ -38,7 +38,7 @@ class BackupSetManager:
def getSets(self): def getSets(self):
#list all current sets by name #list all current sets by name
keys = self.paths.keys() keys = list(self.paths.keys())
keys.sort() keys.sort()
return keys return keys

View File

@ -6,7 +6,7 @@ import resources.lib.utils as utils
#don't die on import error yet, these might not even get used #don't die on import error yet, these might not even get used
try: try:
import dropbox from . import dropbox
except ImportError: except ImportError:
pass pass

View File

@ -1,15 +1,14 @@
import xbmc import xbmc
import xbmcgui import xbmcgui
import xbmcvfs import xbmcvfs
import utils as utils
import time import time
import json import json
from . import utils as utils
from datetime import datetime from datetime import datetime
from vfs import XBMCFileSystem,DropboxFileSystem,ZipFileSystem,GoogleDriveFilesystem from . vfs import XBMCFileSystem,DropboxFileSystem,ZipFileSystem,GoogleDriveFilesystem
from progressbar import BackupProgressBar from . progressbar import BackupProgressBar
from resources.lib.guisettings import GuiSettingsManager from resources.lib.guisettings import GuiSettingsManager
from resources.lib.extractor import ZipExtractor from resources.lib.extractor import ZipExtractor
from __builtin__ import file
def folderSort(aKey): def folderSort(aKey):
result = aKey[0] result = aKey[0]

View File

@ -1,4 +1,4 @@
import utils as utils from . import utils as utils
class ZipExtractor: class ZipExtractor:

View File

@ -1,8 +1,8 @@
import utils as utils
from xml.dom import minidom
from xml.parsers.expat import ExpatError
import json import json
import xbmc,xbmcvfs import xbmc,xbmcvfs
from . import utils as utils
from xml.dom import minidom
from xml.parsers.expat import ExpatError
class GuiSettingsManager: class GuiSettingsManager:

View File

@ -1,5 +1,5 @@
import utils as utils
import xbmcgui import xbmcgui
from . import utils as utils
class BackupProgressBar: class BackupProgressBar:
NONE = 2 NONE = 2

View File

@ -1,13 +1,13 @@
import utils as utils
import xbmc import xbmc
import xbmcvfs import xbmcvfs
import xbmcgui import xbmcgui
import zipfile import zipfile
import os.path import os.path
import sys import sys
import dropbox from . import dropbox
from dropbox.files import WriteMode,CommitInfo,UploadSessionCursor from . import utils as utils
from authorizers import DropboxAuthorizer,GoogleDriveAuthorizer from . dropbox.files import WriteMode,CommitInfo,UploadSessionCursor
from . authorizers import DropboxAuthorizer,GoogleDriveAuthorizer
class Vfs: class Vfs:
root_path = None root_path = None