From 51550aa81c726aedfa7159af0e67f8bcd5fb8a2f Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Fri, 11 Jul 2008 12:23:16 +0000 Subject: fix some imports --- lib/python/Screens/DefaultWizard.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'lib/python/Screens/DefaultWizard.py') diff --git a/lib/python/Screens/DefaultWizard.py b/lib/python/Screens/DefaultWizard.py index 79c68f65..ec45a28f 100644 --- a/lib/python/Screens/DefaultWizard.py +++ b/lib/python/Screens/DefaultWizard.py @@ -1,18 +1,16 @@ from Wizard import wizardManager from Screens.WizardLanguage import WizardLanguage -from Tools.Directories import crawlDirectory, resolveFilename, SCOPE_DEFAULTDIR, SCOPE_DEFAULTPARTITIONMOUNTDIR, SCOPE_DEFAULTPARTITION +from Tools.Directories import resolveFilename, SCOPE_DEFAULTDIR, SCOPE_DEFAULTPARTITIONMOUNTDIR, SCOPE_DEFAULTPARTITION from Components.Pixmap import Pixmap, MovingPixmap from Components.config import config, ConfigBoolean, configfile, ConfigYesNo, getConfigListEntry -from Components.DreamInfoHandler import DreamInfoHandler, InfoHandler, InfoHandlerParseError +from Components.DreamInfoHandler import DreamInfoHandler from Components.PluginComponent import plugins from Plugins.Plugin import PluginDescriptor -import os +from os import system as os_system, path as os_path config.misc.defaultchosen = ConfigBoolean(default = True) -import xml.sax - class DefaultWizard(WizardLanguage, DreamInfoHandler): def __init__(self, session, silent = True, showSteps = False, neededTag = None): DreamInfoHandler.__init__(self, self.statusCallback, neededTag = neededTag) @@ -27,7 +25,7 @@ class DefaultWizard(WizardLanguage, DreamInfoHandler): self["arrowup2"] = MovingPixmap() def setDirectory(self): - os.system("mount %s %s" % (resolveFilename(SCOPE_DEFAULTPARTITION), resolveFilename(SCOPE_DEFAULTPARTITIONMOUNTDIR))) + os_system("mount %s %s" % (resolveFilename(SCOPE_DEFAULTPARTITION), resolveFilename(SCOPE_DEFAULTPARTITIONMOUNTDIR))) self.directory = resolveFilename(SCOPE_DEFAULTPARTITIONMOUNTDIR) self.xmlfile = "defaultwizard.xml" @@ -64,8 +62,8 @@ class DefaultWizard(WizardLanguage, DreamInfoHandler): class DreamPackageWizard(DefaultWizard): def __init__(self, session, packagefile, silent = False): - os.system("mkdir /tmp/package") - os.system("tar xpzf %s -C /tmp/package" % packagefile) + os_system("mkdir /tmp/package") + os_system("tar xpzf %s -C /tmp/package" % packagefile) self.packagefile = packagefile DefaultWizard.__init__(self, session, silent) @@ -85,13 +83,13 @@ class ImageDefaultInstaller(DreamInfoHandler): def install(choice): if choice is not None: - #os.system("mkdir /tmp/package && tar xpzf %s ") + #os_system("mkdir /tmp/package && tar xpzf %s ") choice[2].open(DreamPackageWizard, choice[1]) def filescan_open(list, session, **kwargs): from Screens.ChoiceBox import ChoiceBox print "open default wizard" - filelist = [(os.path.split(x.path)[1], x.path, session) for x in list] + filelist = [(os_path.split(x.path)[1], x.path, session) for x in list] print filelist session.openWithCallback(install, ChoiceBox, title = _("Please choose he package..."), list=filelist) -- cgit v1.2.3