aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Screens
diff options
context:
space:
mode:
Diffstat (limited to 'lib/python/Screens')
-rw-r--r--lib/python/Screens/ChannelSelection.py1
-rw-r--r--lib/python/Screens/DefaultWizard.py18
-rw-r--r--lib/python/Screens/InfoBar.py2
-rw-r--r--lib/python/Screens/InfoBarGenerics.py4
-rw-r--r--lib/python/Screens/LocationBox.py3
-rw-r--r--lib/python/Screens/Satconfig.py2
-rw-r--r--lib/python/Screens/Screen.py2
-rw-r--r--lib/python/Screens/Setup.py4
-rw-r--r--lib/python/Screens/TimerEntry.py28
9 files changed, 27 insertions, 37 deletions
diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 2fd3bd8b..b203b24e 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -21,7 +21,6 @@ profile("ChannelSelection.py 2.3")
from Components.Input import Input
profile("ChannelSelection.py 3")
from Components.ParentalControl import parentalControl
-from Components.Pixmap import Pixmap
from Screens.InputBox import InputBox, PinInput
from Screens.MessageBox import MessageBox
from Screens.ServiceInfo import ServiceInfo
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)
diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 05c5c98a..41df2475 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -1,4 +1,4 @@
-from Tools.Profile import profile, profile_final
+from Tools.Profile import profile
from Screen import Screen
diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 3a735dec..81a776f9 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -2,11 +2,9 @@ from ChannelSelection import ChannelSelection, BouquetSelector
from Components.ActionMap import ActionMap, HelpableActionMap
from Components.ActionMap import NumberActionMap
-from Components.BlinkingPixmap import BlinkingPixmapConditional
from Components.Harddisk import harddiskmanager
from Components.Input import Input
from Components.Label import Label
-from Components.Pixmap import Pixmap
from Components.PluginComponent import plugins
from Components.ServiceEventTracker import ServiceEventTracker
from Components.Sources.Boolean import Boolean
@@ -34,7 +32,7 @@ from Tools import Notifications
from Tools.Directories import SCOPE_HDD, resolveFilename, pathExists
from enigma import eTimer, eServiceCenter, eDVBServicePMTHandler, iServiceInformation, \
- iPlayableService, eServiceReference, eDVBResourceManager, iFrontendInformation, eEPGCache
+ iPlayableService, eServiceReference, eEPGCache
from time import time, localtime, strftime
from os import stat as os_stat
diff --git a/lib/python/Screens/LocationBox.py b/lib/python/Screens/LocationBox.py
index 6d360339..e41601a9 100644
--- a/lib/python/Screens/LocationBox.py
+++ b/lib/python/Screens/LocationBox.py
@@ -12,8 +12,7 @@ from Screens.ChoiceBox import ChoiceBox
# Generic
from Tools.BoundFunction import boundFunction
from Tools.Directories import *
-from Components.config import config, configfile, ConfigSubList, ConfigSubsection, \
- ConfigText, ConfigNumber, ConfigBoolean
+from Components.config import config
import os
# Quickselect
diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 3aabc0e1..40bf7046 100644
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -4,7 +4,7 @@ from Components.SystemInfo import SystemInfo
from Components.ActionMap import ActionMap
from Components.ConfigList import ConfigListScreen
from Components.MenuList import MenuList
-from Components.NimManager import nimmanager, InitNimManager
+from Components.NimManager import nimmanager
from Components.config import getConfigListEntry, config, ConfigNothing, ConfigSelection, updateConfigElement
from Screens.MessageBox import MessageBox
diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index 287847ba..2ba7342f 100644
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -1,4 +1,4 @@
-from Tools.Profile import profile, profile_final
+from Tools.Profile import profile
profile("LOAD:GUISkin")
from Components.GUISkin import GUISkin
diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index f352e8cb..3ff0b76e 100644
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -7,8 +7,6 @@ from Components.Label import Label
from Components.Pixmap import Pixmap
import xml.dom.minidom
-from skin import elementsWithTag
-
from Tools import XMLTools
# FIXME: use resolveFile!
@@ -151,7 +149,7 @@ class Setup(ConfigListScreen, Screen):
def getSetupTitle(id):
xmldata = setupdom.childNodes[0].childNodes
- for x in elementsWithTag(xmldata, "setup"):
+ for x in XMLTools.elementsWithTag(xmldata, "setup"):
if x.getAttribute("key") == id:
return x.getAttribute("title").encode("UTF-8")
raise "unknown setup id '%s'!" % repr(id)
diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index ca1a3929..31a65a30 100644
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -8,15 +8,13 @@ from Components.MenuList import MenuList
from Components.Button import Button
from Components.Label import Label
from Components.Pixmap import Pixmap
-from Components.SelectionList import SelectionList, SelectionEntryComponent
-from Components.MovieList import MovieList
from Screens.LocationBox import MovieLocationBox
from Screens.ChoiceBox import ChoiceBox
from RecordTimer import AFTEREVENT
from Tools.Directories import resolveFilename, SCOPE_HDD
-from enigma import eEPGCache, eServiceReference
-import time
-import datetime
+from enigma import eEPGCache
+from time import localtime, mktime, time, strftime
+from datetime import datetime
class TimerEntry(Screen, ConfigListScreen):
def __init__(self, session, timer):
@@ -82,7 +80,7 @@ class TimerEntry(Screen, ConfigListScreen):
else: # once
type = "once"
repeated = None
- weekday = (int(time.strftime("%w", time.localtime(self.timer.begin))) - 1) % 7
+ weekday = (int(strftime("%w", localtime(self.timer.begin))) - 1) % 7
day[weekday] = 1
self.timerentry_justplay = ConfigSelection(choices = [("zap", _("zap")), ("record", _("record"))], default = {0: "record", 1: "zap"}[justplay])
@@ -247,14 +245,14 @@ class TimerEntry(Screen, ConfigListScreen):
self["config"].invalidate(self.channelEntry)
def getTimestamp(self, date, mytime):
- d = time.localtime(date)
- dt = datetime.datetime(d.tm_year, d.tm_mon, d.tm_mday, mytime[0], mytime[1])
- return int(time.mktime(dt.timetuple()))
+ d = localtime(date)
+ dt = datetime(d.tm_year, d.tm_mon, d.tm_mday, mytime[0], mytime[1])
+ return int(mktime(dt.timetuple()))
def buildRepeatedBegin(self, rep_time, start_time):
- d = time.localtime(rep_time)
- dt = datetime.datetime(d.tm_year, d.tm_mon, d.tm_mday, start_time[0], start_time[1])
- return int(time.mktime(dt.timetuple()))
+ d = localtime(rep_time)
+ dt = datetime(d.tm_year, d.tm_mon, d.tm_mday, start_time[0], start_time[1])
+ return int(mktime(dt.timetuple()))
def getBeginEnd(self):
enddate = self.timerentry_enddate.value
@@ -305,8 +303,8 @@ class TimerEntry(Screen, ConfigListScreen):
self.timer.setRepeated(x)
self.timer.repeatedbegindate = self.buildRepeatedBegin(self.timerentry_repeatedbegindate.value, self.timerentry_starttime.value)
- self.timer.begin = self.getTimestamp(time.time(), self.timerentry_starttime.value)
- self.timer.end = self.getTimestamp(time.time(), self.timerentry_endtime.value)
+ self.timer.begin = self.getTimestamp(time(), self.timerentry_starttime.value)
+ self.timer.end = self.getTimestamp(time(), self.timerentry_endtime.value)
# when a timer end is set before the start, add 1 day
if self.timer.end < self.timer.begin:
@@ -392,7 +390,7 @@ class TimerLog(Screen):
def fillLogList(self):
self.list = [ ]
for x in self.log_entries:
- self.list.append((str(time.strftime("%Y-%m-%d %H-%M", time.localtime(x[0])) + " - " + x[2]), x))
+ self.list.append((str(strftime("%Y-%m-%d %H-%M", localtime(x[0])) + " - " + x[2]), x))
def clearLog(self):
self.log_entries = []
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-19 02:52:31 +0000