diff options
118 files changed, 165 insertions, 358 deletions
diff --git a/Navigation.py b/Navigation.py index cde4ca4c..7b1deb03 100644 --- a/Navigation.py +++ b/Navigation.py @@ -7,8 +7,6 @@ import SleepTimer import NavigationInstance import ServiceReference -from time import time - # TODO: remove pNavgation, eNavigation and rewrite this stuff in python. class Navigation: def __init__(self): diff --git a/RecordTimer.py b/RecordTimer.py index 1c707c36..765e1334 100644 --- a/RecordTimer.py +++ b/RecordTimer.py @@ -1,9 +1,8 @@ import time -import codecs #from time import datetime from Tools import Directories, Notifications -from Components.config import config, ConfigYesNo +from Components.config import config import timer import xml.dom.minidom diff --git a/ServiceReference.py b/ServiceReference.py index f7aa6397..11e28786 100644 --- a/ServiceReference.py +++ b/ServiceReference.py @@ -1,7 +1,5 @@ from enigma import eServiceReference, eServiceCenter -import NavigationInstance - class ServiceReference(eServiceReference): def __init__(self, ref): if not isinstance(ref, eServiceReference): diff --git a/e2reactor.py b/e2reactor.py index 4f069f91..a3d8ce19 100644 --- a/e2reactor.py +++ b/e2reactor.py @@ -11,7 +11,7 @@ Maintainer: U{Felix Domke<mailto:tmbinc@elitedvb.net>} import select, errno, sys # Twisted imports -from twisted.python import log, threadable, failure +from twisted.python import log, failure from twisted.internet import main, posixbase, error #from twisted.internet.pollreactor import PollReactor, poller diff --git a/lib/actions/parseactions.py b/lib/actions/parseactions.py index d0c1aec3..4ab71af7 100644 --- a/lib/actions/parseactions.py +++ b/lib/actions/parseactions.py @@ -1,6 +1,6 @@ # takes a header file, outputs action ids -import token, tokenize, os, sys, string +import tokenize, sys, string def filter(g): while 1: diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py index 67fad7bc..d3224fd7 100644 --- a/lib/python/Components/AVSwitch.py +++ b/lib/python/Components/AVSwitch.py @@ -1,5 +1,4 @@ from config import config, ConfigSelection, ConfigYesNo, ConfigEnableDisable, ConfigSubsection, ConfigBoolean -import os from enigma import eAVSwitch class AVSwitch: diff --git a/lib/python/Components/BlinkingPixmap.py b/lib/python/Components/BlinkingPixmap.py index fef80620..492f14e1 100644 --- a/lib/python/Components/BlinkingPixmap.py +++ b/lib/python/Components/BlinkingPixmap.py @@ -1,5 +1,5 @@ -from Pixmap import * -from ConditionalWidget import * +from Pixmap import PixmapConditional +from ConditionalWidget import BlinkingWidgetConditional, BlinkingWidget class BlinkingPixmap(BlinkingWidget): def __init__(self): diff --git a/lib/python/Components/Button.py b/lib/python/Components/Button.py index f1acb99d..25346b42 100644 --- a/lib/python/Components/Button.py +++ b/lib/python/Components/Button.py @@ -1,6 +1,6 @@ -from HTMLComponent import * -from GUIComponent import * -from VariableText import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent +from VariableText import VariableText from enigma import eButton diff --git a/lib/python/Components/ChoiceList.py b/lib/python/Components/ChoiceList.py index a7a5e483..14216cf1 100644 --- a/lib/python/Components/ChoiceList.py +++ b/lib/python/Components/ChoiceList.py @@ -1,5 +1,5 @@ -from HTMLComponent import * -from GUIComponent import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent from MenuList import MenuList from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, eListbox, gFont, loadPNG diff --git a/lib/python/Components/Clock.py b/lib/python/Components/Clock.py index 9a6031e6..ddd6ffb1 100644 --- a/lib/python/Components/Clock.py +++ b/lib/python/Components/Clock.py @@ -1,6 +1,6 @@ -from HTMLComponent import * -from GUIComponent import * -from VariableText import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent +from VariableText import VariableText from enigma import eTimer, eLabel diff --git a/lib/python/Components/ConditionalWidget.py b/lib/python/Components/ConditionalWidget.py index 7d35d956..f826c296 100644 --- a/lib/python/Components/ConditionalWidget.py +++ b/lib/python/Components/ConditionalWidget.py @@ -1,4 +1,4 @@ -from GUIComponent import * +from GUIComponent import GUIComponent from enigma import eTimer class ConditionalWidget(GUIComponent): diff --git a/lib/python/Components/ConfigList.py b/lib/python/Components/ConfigList.py index 534459e4..7ed6031a 100644 --- a/lib/python/Components/ConfigList.py +++ b/lib/python/Components/ConfigList.py @@ -1,5 +1,5 @@ -from HTMLComponent import * -from GUIComponent import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent from config import KEY_LEFT, KEY_RIGHT, KEY_0, KEY_DELETE, KEY_OK, KEY_TIMEOUT, ConfigElement from Components.ActionMap import NumberActionMap from enigma import eListbox, eListboxPythonConfigContent, eTimer diff --git a/lib/python/Components/DiskInfo.py b/lib/python/Components/DiskInfo.py index ba04ea49..07a6aa4b 100644 --- a/lib/python/Components/DiskInfo.py +++ b/lib/python/Components/DiskInfo.py @@ -1,5 +1,5 @@ -from GUIComponent import * -from VariableText import * +from GUIComponent import GUIComponent +from VariableText import VariableText from os import statvfs from enigma import eLabel diff --git a/lib/python/Components/EpgList.py b/lib/python/Components/EpgList.py index 4a182322..23d77846 100644 --- a/lib/python/Components/EpgList.py +++ b/lib/python/Components/EpgList.py @@ -1,10 +1,9 @@ -from HTMLComponent import * -from GUIComponent import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent from enigma import eEPGCache, eListbox, eListboxPythonMultiContent, gFont, loadPNG, \ RT_HALIGN_LEFT, RT_HALIGN_RIGHT, RT_HALIGN_CENTER, RT_VALIGN_CENTER -from re import * from time import localtime, time from ServiceReference import ServiceReference from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py index 3b02817c..ae171c30 100644 --- a/lib/python/Components/FileList.py +++ b/lib/python/Components/FileList.py @@ -1,5 +1,5 @@ -from HTMLComponent import * -from GUIComponent import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent import re from os import path as os_path, listdir diff --git a/lib/python/Components/GUISkin.py b/lib/python/Components/GUISkin.py index fc8f38cb..0fb94214 100644 --- a/lib/python/Components/GUISkin.py +++ b/lib/python/Components/GUISkin.py @@ -1,4 +1,4 @@ -from GUIComponent import * +from GUIComponent import GUIComponent from skin import applyAllAttributes from Tools.CList import CList diff --git a/lib/python/Components/Header.py b/lib/python/Components/Header.py index 6f085c15..e69de29b 100644 --- a/lib/python/Components/Header.py +++ b/lib/python/Components/Header.py @@ -1,17 +0,0 @@ -from HTMLComponent import * -from GUIComponent import * -from VariableText import * - -from enigma import eLabel - -class Header(VariableText, HTMLComponent, GUIComponent): - - def __init__(self, message): - GUIComponent.__init__(self) - VariableText.__init__(self) - self.setText(message) - - def produceHTML(self): - return "<h2>" + self.getText() + "</h2>\n" - - GUI_WIDGET = eLabel diff --git a/lib/python/Components/HelpMenuList.py b/lib/python/Components/HelpMenuList.py index 99bd536d..07bbdd2a 100644 --- a/lib/python/Components/HelpMenuList.py +++ b/lib/python/Components/HelpMenuList.py @@ -1,4 +1,4 @@ -from GUIComponent import * +from GUIComponent import GUIComponent from enigma import eListboxPythonMultiContent, eListbox, gFont diff --git a/lib/python/Components/Input.py b/lib/python/Components/Input.py index b30a74e4..e0a7f449 100644 --- a/lib/python/Components/Input.py +++ b/lib/python/Components/Input.py @@ -1,6 +1,6 @@ -from HTMLComponent import * -from GUIComponent import * -from VariableText import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent +from VariableText import VariableText from enigma import eLabel diff --git a/lib/python/Components/Label.py b/lib/python/Components/Label.py index 4d90badc..7e61275b 100644 --- a/lib/python/Components/Label.py +++ b/lib/python/Components/Label.py @@ -1,8 +1,8 @@ -from HTMLComponent import * -from GUIComponent import * -from VariableText import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent +from VariableText import VariableText -from ConditionalWidget import * +from ConditionalWidget import ConditionalWidget, BlinkingWidget, BlinkingWidgetConditional from enigma import eLabel diff --git a/lib/python/Components/MediaPlayer.py b/lib/python/Components/MediaPlayer.py index ec0000c9..a728aef7 100644 --- a/lib/python/Components/MediaPlayer.py +++ b/lib/python/Components/MediaPlayer.py @@ -1,5 +1,5 @@ -from HTMLComponent import * -from GUIComponent import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent from MenuList import MenuList diff --git a/lib/python/Components/MenuList.py b/lib/python/Components/MenuList.py index dcbe7c1a..876300bd 100644 --- a/lib/python/Components/MenuList.py +++ b/lib/python/Components/MenuList.py @@ -1,5 +1,5 @@ -from HTMLComponent import * -from GUIComponent import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent from enigma import eListboxPythonStringContent, eListbox diff --git a/lib/python/Components/MovieList.py b/lib/python/Components/MovieList.py index 45a34fb9..d43b5106 100644 --- a/lib/python/Components/MovieList.py +++ b/lib/python/Components/MovieList.py @@ -1,4 +1,4 @@ -from GUIComponent import * +from GUIComponent import GUIComponent from Tools.FuzzyDate import FuzzyTime from ServiceReference import ServiceReference from Components.MultiContent import MultiContentEntryText diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py index a8c75907..6fbd9994 100644 --- a/lib/python/Components/Network.py +++ b/lib/python/Components/Network.py @@ -1,5 +1,3 @@ -from Components.config import config, ConfigYesNo, ConfigIP, NoSave, ConfigSubsection, ConfigMAC - import os import re from socket import * diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index 70ce4dbe..22c99520 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -7,15 +7,9 @@ from enigma import eDVBSatelliteEquipmentControl as secClass, \ eDVBSatelliteRotorParameters as rotorParam, \ eDVBResourceManager -import xml.dom.minidom -from xml.dom import EMPTY_NAMESPACE -from skin import elementsWithTag -from Tools import XMLTools - from xml.sax import make_parser from xml.sax.handler import ContentHandler -from Tools.BoundFunction import boundFunction from time import localtime, mktime from datetime import datetime diff --git a/lib/python/Components/ParentalControl.py b/lib/python/Components/ParentalControl.py index bf971813..8c8a3305 100644 --- a/lib/python/Components/ParentalControl.py +++ b/lib/python/Components/ParentalControl.py @@ -1,6 +1,5 @@ from Components.config import config, ConfigSubsection, ConfigSelection, ConfigPIN, ConfigYesNo, ConfigSubList, ConfigInteger -from Components.Input import Input -from Screens.InputBox import InputBox, PinInput +from Screens.InputBox import PinInput from Screens.MessageBox import MessageBox from Tools.BoundFunction import boundFunction from ServiceReference import ServiceReference diff --git a/lib/python/Components/ParentalControlList.py b/lib/python/Components/ParentalControlList.py index db8fd8e2..f5185550 100644 --- a/lib/python/Components/ParentalControlList.py +++ b/lib/python/Components/ParentalControlList.py @@ -1,5 +1,5 @@ -from HTMLComponent import * -from GUIComponent import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent from MenuList import MenuList from Components.ParentalControl import parentalControl diff --git a/lib/python/Components/PerServiceDisplay.py b/lib/python/Components/PerServiceDisplay.py index 27f15171..6e02cce9 100644 --- a/lib/python/Components/PerServiceDisplay.py +++ b/lib/python/Components/PerServiceDisplay.py @@ -1,6 +1,6 @@ -from GUIComponent import * -from VariableText import * -from VariableValue import * +from GUIComponent import GUIComponent +from VariableText import VariableText +from VariableValue import VariableValue from enigma import iPlayableService from enigma import eLabel, eSlider, eTimer diff --git a/lib/python/Components/PluginList.py b/lib/python/Components/PluginList.py index 07a71748..3a3bef1e 100644 --- a/lib/python/Components/PluginList.py +++ b/lib/python/Components/PluginList.py @@ -1,12 +1,12 @@ -from HTMLComponent import * -from GUIComponent import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent from MenuList import MenuList from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE from Components.MultiContent import MultiContentEntryText, MultiContentEntryPixmapAlphaTest -from enigma import loadPNG, eListboxPythonMultiContent, RT_HALIGN_LEFT, eListbox, gFont +from enigma import loadPNG, eListboxPythonMultiContent, eListbox, gFont def PluginEntryComponent(plugin): res = [ plugin ] diff --git a/lib/python/Components/ProgressBar.py b/lib/python/Components/ProgressBar.py index f18c4672..d97ac832 100644 --- a/lib/python/Components/ProgressBar.py +++ b/lib/python/Components/ProgressBar.py @@ -1,6 +1,6 @@ -from HTMLComponent import * -from GUIComponent import * -from VariableValue import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent +from VariableValue import VariableValue from enigma import eSlider diff --git a/lib/python/Components/RecordingConfig.py b/lib/python/Components/RecordingConfig.py index 6a3bfb68..d3a0daf2 100644 --- a/lib/python/Components/RecordingConfig.py +++ b/lib/python/Components/RecordingConfig.py @@ -1,5 +1,4 @@ from config import ConfigInteger, ConfigYesNo, ConfigSubsection, config -import os def InitRecordingConfig(): config.recording = ConfigSubsection(); diff --git a/lib/python/Components/Renderer/Listbox.py b/lib/python/Components/Renderer/Listbox.py index a1f89377..ef8206af 100644 --- a/lib/python/Components/Renderer/Listbox.py +++ b/lib/python/Components/Renderer/Listbox.py @@ -1,7 +1,4 @@ -from Components.VariableText import VariableText from Renderer import Renderer -from Tools.Event import Event - from enigma import eListbox # the listbox renderer is the listbox, but no listbox content. diff --git a/lib/python/Components/ScrollLabel.py b/lib/python/Components/ScrollLabel.py index 85e176f6..aa5163b8 100644 --- a/lib/python/Components/ScrollLabel.py +++ b/lib/python/Components/ScrollLabel.py @@ -1,6 +1,6 @@ import skin -from HTMLComponent import * -from GUIComponent import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent from enigma import eLabel, eWidget, eSlider, fontRenderClass, ePoint, eSize class ScrollLabel(HTMLComponent, GUIComponent): diff --git a/lib/python/Components/ServiceEventTracker.py b/lib/python/Components/ServiceEventTracker.py index 99c02faa..20460436 100644 --- a/lib/python/Components/ServiceEventTracker.py +++ b/lib/python/Components/ServiceEventTracker.py @@ -1,5 +1,3 @@ -from enigma import pNavigation - class ServiceEventTracker: """Tracks service events into a screen""" diff --git a/lib/python/Components/ServiceList.py b/lib/python/Components/ServiceList.py index 7dfcd05d..b255cd99 100644 --- a/lib/python/Components/ServiceList.py +++ b/lib/python/Components/ServiceList.py @@ -1,11 +1,11 @@ -from HTMLComponent import * -from GUIComponent import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent from enigma import loadPNG, eListboxServiceContent, eListbox, eServiceCenter, eServiceReference, gFont, eRect from string import upper -from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCOPE_FONTS +from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE class ServiceList(HTMLComponent, GUIComponent): MODE_NORMAL = 0 diff --git a/lib/python/Components/ServiceScan.py b/lib/python/Components/ServiceScan.py index d812fddb..09498713 100644 --- a/lib/python/Components/ServiceScan.py +++ b/lib/python/Components/ServiceScan.py @@ -1,4 +1,4 @@ -from enigma import eComponentScan, eDVBFrontendParametersSatellite, eDVBFrontendParametersCable, eDVBFrontendParametersTerrestrial +from enigma import eComponentScan class ServiceScan: diff --git a/lib/python/Components/SetupDevices.py b/lib/python/Components/SetupDevices.py index 546d04a7..71fb1e47 100644 --- a/lib/python/Components/SetupDevices.py +++ b/lib/python/Components/SetupDevices.py @@ -1,4 +1,4 @@ -from config import config, ConfigSlider, ConfigSelection, ConfigSubsection, ConfigOnOff, ConfigText +from config import config, ConfigSelection, ConfigSubsection, ConfigOnOff, ConfigText from Components.Timezones import timezones from Components.Language import language diff --git a/lib/python/Components/Slider.py b/lib/python/Components/Slider.py index b8144bb5..a36a573a 100644 --- a/lib/python/Components/Slider.py +++ b/lib/python/Components/Slider.py @@ -1,7 +1,6 @@ -from HTMLComponent import * -from GUIComponent import * -from VariableValue import * -from VariableText import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent +from VariableValue import VariableValue from enigma import eSlider diff --git a/lib/python/Components/Sources/Clock.py b/lib/python/Components/Sources/Clock.py index 4833ddde..4c4b41e6 100644 --- a/lib/python/Components/Sources/Clock.py +++ b/lib/python/Components/Sources/Clock.py @@ -1,4 +1,3 @@ -from Tools.Event import Event from Components.Element import cached from enigma import eTimer import time diff --git a/lib/python/Components/Sources/CurrentService.py b/lib/python/Components/Sources/CurrentService.py index 8e582d55..acc624a2 100644 --- a/lib/python/Components/Sources/CurrentService.py +++ b/lib/python/Components/Sources/CurrentService.py @@ -3,8 +3,6 @@ from enigma import iPlayableService from Source import Source from Components.Element import cached -from time import time - class CurrentService(PerServiceBase, Source): def __init__(self, navcore): Source.__init__(self) diff --git a/lib/python/Components/Sources/EventInfo.py b/lib/python/Components/Sources/EventInfo.py index 72d5f18d..a4bc874f 100644 --- a/lib/python/Components/Sources/EventInfo.py +++ b/lib/python/Components/Sources/EventInfo.py @@ -1,10 +1,8 @@ from Components.PerServiceDisplay import PerServiceBase from Components.Element import cached -from Tools.Event import Event from enigma import iPlayableService from Source import Source -from time import time class EventInfo(PerServiceBase, Source, object): NOW = 0 diff --git a/lib/python/Components/Sources/FrontendStatus.py b/lib/python/Components/Sources/FrontendStatus.py index 1af03f95..5b7e5b0c 100644 --- a/lib/python/Components/Sources/FrontendStatus.py +++ b/lib/python/Components/Sources/FrontendStatus.py @@ -1,5 +1,5 @@ from Source import Source -from enigma import eTimer, iFrontendInformation +from enigma import eTimer class FrontendStatus(Source): def __init__(self, service_source = None, frontend_source = None): diff --git a/lib/python/Components/Sources/List.py b/lib/python/Components/Sources/List.py index e141da59..d7221296 100644 --- a/lib/python/Components/Sources/List.py +++ b/lib/python/Components/Sources/List.py @@ -1,5 +1,4 @@ from Source import Source -from Tools.Event import Event from Components.Element import cached class List(Source, object): diff --git a/lib/python/Components/Sources/StaticText.py b/lib/python/Components/Sources/StaticText.py index 2f8f0e18..6f775c44 100644 --- a/lib/python/Components/Sources/StaticText.py +++ b/lib/python/Components/Sources/StaticText.py @@ -1,5 +1,4 @@ from Source import Source -from Components.Element import cached class StaticText(Source): # filter is a function which filters external, untrusted strings diff --git a/lib/python/Components/TimerList.py b/lib/python/Components/TimerList.py index c732e947..e31a0f4a 100644 --- a/lib/python/Components/TimerList.py +++ b/lib/python/Components/TimerList.py @@ -1,11 +1,10 @@ -from HTMLComponent import * -from GUIComponent import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent from Tools.FuzzyDate import FuzzyTime -import time from enigma import eListboxPythonMultiContent, eListbox, gFont, loadPNG, \ - RT_HALIGN_CENTER, RT_HALIGN_LEFT, RT_HALIGN_RIGHT, RT_VALIGN_CENTER + RT_HALIGN_LEFT, RT_HALIGN_RIGHT, RT_VALIGN_CENTER from timer import TimerEntry from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE diff --git a/lib/python/Components/TimerSanityCheck.py b/lib/python/Components/TimerSanityCheck.py index 35e78de0..50daa2f1 100644 --- a/lib/python/Components/TimerSanityCheck.py +++ b/lib/python/Components/TimerSanityCheck.py @@ -1,4 +1,3 @@ -from Components.NimManager import nimmanager from time import localtime class TimerSanityCheck: diff --git a/lib/python/Components/VariableText.py b/lib/python/Components/VariableText.py index bb8b5fe3..d20e5193 100644 --- a/lib/python/Components/VariableText.py +++ b/lib/python/Components/VariableText.py @@ -1,5 +1,3 @@ -import skin - class VariableText(object): """VariableText can be used for components which have a variable text, based on any widget with setText call""" diff --git a/lib/python/Components/VariableValue.py b/lib/python/Components/VariableValue.py index 288de01a..7fde0af1 100644 --- a/lib/python/Components/VariableValue.py +++ b/lib/python/Components/VariableValue.py @@ -1,5 +1,3 @@ -import skin - class VariableValue(object): """VariableValue can be used for components which have a variable value (like eSlider), based on any widget with setValue call""" diff --git a/lib/python/Components/VolumeBar.py b/lib/python/Components/VolumeBar.py index c51bdb19..1ada3c69 100644 --- a/lib/python/Components/VolumeBar.py +++ b/lib/python/Components/VolumeBar.py @@ -1,10 +1,8 @@ -from HTMLComponent import * -from GUIComponent import * -from VariableValue import * -from VariableText import * +from HTMLComponent import HTMLComponent +from GUIComponent import GUIComponent +from VariableValue import VariableValue from enigma import eSlider -from enigma import eLabel class VolumeBar(VariableValue, HTMLComponent, GUIComponent): def __init__(self): diff --git a/lib/python/Components/components.py b/lib/python/Components/components.py index 87159bf6..e69de29b 100644 --- a/lib/python/Components/components.py +++ b/lib/python/Components/components.py @@ -1,23 +0,0 @@ -import time -import sys - -import HTMLComponent -import HTMLSkin -import GUISkin -import GUIComponent -import VariableValue -import Clock -import Button -import Label -import Header -import VolumeBar -import ProgressBar -import MenuList -import config -import ConfigList -import ServiceList -import ServiceScan -import ActionMap -import PerServiceDisplay -import EventInfo -import ServiceName diff --git a/lib/python/Plugins/DemoPlugins/TestPlugin/plugin.py b/lib/python/Plugins/DemoPlugins/TestPlugin/plugin.py index dae4d4ab..5456fb18 100644 --- a/lib/python/Plugins/DemoPlugins/TestPlugin/plugin.py +++ b/lib/python/Plugins/DemoPlugins/TestPlugin/plugin.py @@ -1,10 +1,9 @@ from Screens.Screen import Screen from Screens.MessageBox import MessageBox from Components.ActionMap import NumberActionMap -from Components.Label import Label from Components.Input import Input from Components.Pixmap import Pixmap -from Components.FileList import FileEntryComponent, FileList +from Components.FileList import FileList from Screens.ChoiceBox import ChoiceBox from Plugins.Plugin import PluginDescriptor diff --git a/lib/python/Plugins/Extensions/CutListEditor/plugin.py b/lib/python/Plugins/Extensions/CutListEditor/plugin.py index 4c425532..200e37cc 100644 --- a/lib/python/Plugins/Extensions/CutListEditor/plugin.py +++ b/lib/python/Plugins/Extensions/CutListEditor/plugin.py @@ -4,7 +4,6 @@ from Screens.Screen import Screen from Screens.MessageBox import MessageBox from Components.ServicePosition import ServicePositionGauge from Components.ActionMap import HelpableActionMap -from Components.MenuList import MenuList from Components.MultiContent import MultiContentEntryText from Components.ServiceEventTracker import ServiceEventTracker from Components.VideoWindow import VideoWindow diff --git a/lib/python/Plugins/Extensions/FileManager/plugin.py b/lib/python/Plugins/Extensions/FileManager/plugin.py index 3cbef343..09a20e06 100644 --- a/lib/python/Plugins/Extensions/FileManager/plugin.py +++ b/lib/python/Plugins/Extensions/FileManager/plugin.py @@ -1,7 +1,7 @@ from Screens.Screen import Screen from Components.ActionMap import NumberActionMap from Components.Pixmap import Pixmap -from Components.FileList import FileEntryComponent, FileList +from Components.FileList import FileList from Plugins.Plugin import PluginDescriptor class FileManager(Screen): diff --git a/lib/python/Plugins/Extensions/FritzCall/plugin.py b/lib/python/Plugins/Extensions/FritzCall/plugin.py index 339f2dd1..0b67345b 100644 --- a/lib/python/Plugins/Extensions/FritzCall/plugin.py +++ b/lib/python/Plugins/Extensions/FritzCall/plugin.py @@ -1,7 +1,6 @@ from Screens.Screen import Screen from Screens.MessageBox import MessageBox from Components.ActionMap import ActionMap -from Components.Label import Label from Plugins.Plugin import PluginDescriptor from Tools import Notifications @@ -9,12 +8,10 @@ from twisted.internet import reactor from twisted.internet.protocol import ReconnectingClientFactory from twisted.protocols.basic import LineReceiver -from enigma import eTimer - my_global_session = None from Components.config import config, ConfigSubsection, ConfigIP, ConfigEnableDisable, getConfigListEntry -from Components.ConfigList import ConfigList, ConfigListScreen +from Components.ConfigList import ConfigListScreen config.plugins.FritzCall = ConfigSubsection() config.plugins.FritzCall.hostname = ConfigIP(default = [192,168,178,254]) @@ -28,8 +25,6 @@ class FritzCallSetup(ConfigListScreen, Screen): def __init__(self, session, args = None): - from Tools.BoundFunction import boundFunction - Screen.__init__(self, session) self.onClose.append(self.abort) diff --git a/lib/python/Plugins/Extensions/PicturePlayer/plugin.py b/lib/python/Plugins/Extensions/PicturePlayer/plugin.py index 8a591090..c54669bb 100644 --- a/lib/python/Plugins/Extensions/PicturePlayer/plugin.py +++ b/lib/python/Plugins/Extensions/PicturePlayer/plugin.py @@ -9,7 +9,7 @@ from Components.ConfigList import ConfigList from Components.config import * from Tools.Directories import resolveFilename, pathExists, createDir, SCOPE_MEDIA -from Components.FileList import FileEntryComponent, FileList +from Components.FileList import FileList from Components.AVSwitch import AVSwitch from Plugins.Plugin import PluginDescriptor diff --git a/lib/python/Plugins/Extensions/SimpleRSS/plugin.py b/lib/python/Plugins/Extensions/SimpleRSS/plugin.py index 49da5e63..980fe5d5 100644 --- a/lib/python/Plugins/Extensions/SimpleRSS/plugin.py +++ b/lib/python/Plugins/Extensions/SimpleRSS/plugin.py @@ -5,13 +5,10 @@ from Screens.Screen import Screen from Screens.MessageBox import MessageBox from Components.ActionMap import ActionMap from Components.GUIComponent import GUIComponent -from Components.Label import Label from Components.MultiContent import MultiContentEntryText from Plugins.Plugin import PluginDescriptor -from enigma import eListboxPythonMultiContent, eListbox, gFont, iServiceInformation, RT_HALIGN_LEFT, RT_HALIGN_RIGHT, RT_WRAP +from enigma import eListboxPythonMultiContent, eListbox, gFont, RT_HALIGN_LEFT, RT_WRAP -from twisted.web import server -from twisted.web.resource import Resource from twisted.web.client import getPage import xml.dom.minidom @@ -25,7 +22,7 @@ my_global_session = None urls = ["http://www.heise.de/newsticker/heise.rdf", "http://rss.slashdot.org/Slashdot/slashdot/to"] from Components.config import config, ConfigSubsection, ConfigSelection, getConfigListEntry -from Components.ConfigList import ConfigList, ConfigListScreen +from Components.ConfigList import ConfigListScreen config.simpleRSS = ConfigSubsection() config.simpleRSS.hostname = ConfigSelection(choices = urls) @@ -36,8 +33,6 @@ class SimpleRSS(ConfigListScreen, Screen): </screen>""" def __init__(self, session, args = None): - from Tools.BoundFunction import boundFunction - print "screen init" Screen.__init__(self, session) self.skin = SimpleRSS.skin diff --git a/lib/python/Plugins/Extensions/WebInterface/.cvsignore b/lib/python/Plugins/Extensions/WebInterface/.cvsignore deleted file mode 100644 index 138b9cc2..00000000 --- a/lib/python/Plugins/Extensions/WebInterface/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -*.pyc -*.pyo -Makefile -Makefile.in diff --git a/lib/python/Plugins/Extensions/WebInterface/Makefile.am b/lib/python/Plugins/Extensions/WebInterface/Makefile.am deleted file mode 100644 index e69de29b..00000000 --- a/lib/python/Plugins/Extensions/WebInterface/Makefile.am +++ /dev/null diff --git a/lib/python/Plugins/Extensions/WebInterface/__init__.py b/lib/python/Plugins/Extensions/WebInterface/__init__.py deleted file mode 100644 index e69de29b..00000000 --- a/lib/python/Plugins/Extensions/WebInterface/__init__.py +++ /dev/null diff --git a/lib/python/Plugins/Extensions/WebInterface/plugin.py b/lib/python/Plugins/Extensions/WebInterface/plugin.py deleted file mode 100644 index e69de29b..00000000 --- a/lib/python/Plugins/Extensions/WebInterface/plugin.py +++ /dev/null diff --git a/lib/python/Plugins/Extensions/WebInterface/web-data/Makefile.am b/lib/python/Plugins/Extensions/WebInterface/web-data/Makefile.am deleted file mode 100644 index e69de29b..00000000 --- a/lib/python/Plugins/Extensions/WebInterface/web-data/Makefile.am +++ /dev/null diff --git a/lib/python/Plugins/Extensions/WebInterface/web-data/tools.js b/lib/python/Plugins/Extensions/WebInterface/web-data/tools.js deleted file mode 100644 index e69de29b..00000000 --- a/lib/python/Plugins/Extensions/WebInterface/web-data/tools.js +++ /dev/null diff --git a/lib/python/Plugins/Extensions/WebInterface/web/Makefile.am b/lib/python/Plugins/Extensions/WebInterface/web/Makefile.am deleted file mode 100644 index e69de29b..00000000 --- a/lib/python/Plugins/Extensions/WebInterface/web/Makefile.am +++ /dev/null diff --git a/lib/python/Plugins/Extensions/WebInterface/web/index.html.xml b/lib/python/Plugins/Extensions/WebInterface/web/index.html.xml deleted file mode 100644 index e69de29b..00000000 --- a/lib/python/Plugins/Extensions/WebInterface/web/index.html.xml +++ /dev/null diff --git a/lib/python/Plugins/Extensions/WebInterface/web/stream.m3u.xml b/lib/python/Plugins/Extensions/WebInterface/web/stream.m3u.xml deleted file mode 100644 index e69de29b..00000000 --- a/lib/python/Plugins/Extensions/WebInterface/web/stream.m3u.xml +++ /dev/null diff --git a/lib/python/Plugins/Extensions/WebInterface/web/stream.xml b/lib/python/Plugins/Extensions/WebInterface/web/stream.xml deleted file mode 100644 index e69de29b..00000000 --- a/lib/python/Plugins/Extensions/WebInterface/web/stream.xml +++ /dev/null diff --git a/lib/python/Plugins/Extensions/WebInterface/web/zap.xml b/lib/python/Plugins/Extensions/WebInterface/web/zap.xml deleted file mode 100644 index e69de29b..00000000 --- a/lib/python/Plugins/Extensions/WebInterface/web/zap.xml +++ /dev/null diff --git a/lib/python/Plugins/Extensions/WebInterface/webif.py b/lib/python/Plugins/Extensions/WebInterface/webif.py deleted file mode 100644 index e69de29b..00000000 --- a/lib/python/Plugins/Extensions/WebInterface/webif.py +++ /dev/null diff --git a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py index d225cd00..89f979fe 100644 --- a/lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py +++ b/lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py @@ -9,7 +9,6 @@ from Components.config import ConfigSelection, ConfigSubsection, KEY_LEFT, KEY_R from Components.ConfigList import ConfigList from Plugins.Plugin import PluginDescriptor -from Tools.NumericalTextInput import * from Tools.Directories import * from os import path, makedirs, listdir from time import localtime diff --git a/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py b/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py index 0f6c4e84..17abb0ff 100644 --- a/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py +++ b/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py @@ -1,13 +1,9 @@ from enigma import RT_HALIGN_LEFT, RT_VALIGN_CENTER, eListboxPythonMultiContent, eListbox, eTimer, gFont from Screens.Screen import Screen from Screens.MessageBox import MessageBox -from Components.ActionMap import ActionMap, NumberActionMap +from Components.ActionMap import ActionMap from Components.ScrollLabel import ScrollLabel -from Components.Label import Label -from Components.GUIComponent import * -from Components.MenuList import MenuList -from Components.Input import Input -from Screens.Console import Console +from Components.GUIComponent import GUIComponent from Plugins.Plugin import PluginDescriptor from os import popen diff --git a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py index 1a520771..f3fb35eb 100644 --- a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py +++ b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py @@ -1,5 +1,5 @@ -from enigma import eTimer, eDVBSatelliteEquipmentControl, eDVBResourceManager,\ - eDVBDiseqcCommand, eDVBFrontendParametersSatellite, eDVBFrontendParameters +from enigma import eTimer, eDVBResourceManager,\ + eDVBFrontendParametersSatellite, eDVBFrontendParameters from Screens.Screen import Screen from Screens.ScanSetup import ScanSetup @@ -7,12 +7,11 @@ from Screens.MessageBox import MessageBox from Plugins.Plugin import PluginDescriptor from Components.Label import Label -from Components.ConfigList import ConfigList from Components.TunerInfo import TunerInfo from Components.ActionMap import ActionMap from Components.NimManager import nimmanager, getConfigSatlist from Components.MenuList import MenuList -from Components.config import ConfigSelection, ConfigSatlist, getConfigListEntry +from Components.config import ConfigSelection, getConfigListEntry class Tuner: def __init__(self, frontend): diff --git a/lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py b/lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py index adeff071..fdb26834 100755 --- a/lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py +++ b/lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py @@ -9,7 +9,6 @@ from Components.Pixmap import Pixmap from Components.MenuList import MenuList from Plugins.Plugin import PluginDescriptor from Components.config import config -from Tools.Directories import SCOPE_SKIN from Components.config import config from os import path, walk diff --git a/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py b/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py index c71ffdbb..505b0cdd 100644 --- a/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py +++ b/lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py @@ -4,7 +4,6 @@ from Components.Input import Input from Components.Ipkg import IpkgComponent from Components.Label import Label from Components.MenuList import MenuList -from Components.ScrollLabel import ScrollLabel from Components.Slider import Slider from Plugins.Plugin import PluginDescriptor from Screens.Console import Console diff --git a/lib/python/Screens/About.py b/lib/python/Screens/About.py index 6658bb1a..2c7d98f5 100644 --- a/lib/python/Screens/About.py +++ b/lib/python/Screens/About.py @@ -3,7 +3,6 @@ from Components.ActionMap import ActionMap from Components.Label import Label from Components.Harddisk import Harddisk from Components.NimManager import nimmanager -from Components.MenuList import MenuList from Components.About import about from Tools.DreamboxHardware import getFPVersion diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py index eb6f9059..0fe625bb 100644 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -7,7 +7,6 @@ from Components.ServiceEventTracker import ServiceEventTracker from EpgSelection import EPGSelection from enigma import eServiceReference, eEPGCache, eServiceCenter, eTimer, eDVBDB, iPlayableService, iServiceInformation from Components.config import config, ConfigSubsection, ConfigText -from Screens.FixedMenu import FixedMenu from Tools.NumericalTextInput import NumericalTextInput from Components.NimManager import nimmanager from Components.Sources.Clock import Clock @@ -21,13 +20,11 @@ from Screens.ServiceInfo import ServiceInfo from Screens.RdsDisplay import RassInteractive from ServiceReference import ServiceReference from Tools.BoundFunction import boundFunction -from re import * +from re import compile from os import remove FLAG_SERVICE_NEW_FOUND = 64 #define in lib/dvb/idvb.h as dxNewFound = 64 -import xml.dom.minidom - class BouquetSelector(Screen): def __init__(self, session, bouquets, selectedFunc, enableWrapAround=False): Screen.__init__(self, session) diff --git a/lib/python/Screens/ChoiceBox.py b/lib/python/Screens/ChoiceBox.py index b1d74ad5..0436f66d 100644 --- a/lib/python/Screens/ChoiceBox.py +++ b/lib/python/Screens/ChoiceBox.py @@ -1,8 +1,6 @@ from Screens.Screen import Screen -from Screens.MessageBox import MessageBox from Components.ActionMap import NumberActionMap from Components.Label import Label -from Components.MenuList import MenuList from Components.ChoiceList import ChoiceEntryComponent, ChoiceList class ChoiceBox(Screen): diff --git a/lib/python/Screens/Ci.py b/lib/python/Screens/Ci.py index b6f315b4..46b07794 100644 --- a/lib/python/Screens/Ci.py +++ b/lib/python/Screens/Ci.py @@ -1,15 +1,12 @@ -from Screen import * -from Components.MenuList import MenuList +from Screen import Screen from Components.ActionMap import ActionMap from Components.ActionMap import NumberActionMap -from Components.Header import Header -from Components.Button import Button from Components.Label import Label from Components.config import config, ConfigSubsection, ConfigSelection, ConfigSubList, getConfigListEntry, KEY_LEFT, KEY_RIGHT, KEY_0, ConfigNothing, ConfigPIN from Components.ConfigList import ConfigList -from enigma import eTimer, eDVBCI_UI, eListboxPythonStringContent, eListboxPythonConfigContent +from enigma import eTimer, eDVBCI_UI MAX_NUM_CI = 4 diff --git a/lib/python/Screens/Console.py b/lib/python/Screens/Console.py index 03b0249b..c2e1688d 100644 --- a/lib/python/Screens/Console.py +++ b/lib/python/Screens/Console.py @@ -1,6 +1,6 @@ from enigma import eConsoleAppContainer from Screens.Screen import Screen -from Components.ActionMap import ActionMap, NumberActionMap +from Components.ActionMap import ActionMap from Components.ScrollLabel import ScrollLabel class Console(Screen): diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py index 3103bfa7..9ceb42cf 100644 --- a/lib/python/Screens/EpgSelection.py +++ b/lib/python/Screens/EpgSelection.py @@ -3,21 +3,16 @@ from Components.config import config, ConfigClock from Components.Button import Button from Components.Pixmap import Pixmap from Components.Label import Label -from Components.EpgList import * +from Components.EpgList import EPGList from Components.ActionMap import ActionMap -from Components.ScrollLabel import ScrollLabel from Screens.EventView import EventViewSimple from TimeDateInput import TimeDateInput from enigma import eServiceReference -from Screens.FixedMenu import FixedMenu from RecordTimer import RecordTimerEntry, parseEvent -from TimerEdit import TimerEditList from TimerEntry import TimerEntry from ServiceReference import ServiceReference from time import localtime, time -import xml.dom.minidom - mepg_config_initialized = False class EPGSelection(Screen): diff --git a/lib/python/Screens/EventView.py b/lib/python/Screens/EventView.py index 8504165d..7746b135 100644 --- a/lib/python/Screens/EventView.py +++ b/lib/python/Screens/EventView.py @@ -4,10 +4,9 @@ from Components.Button import Button from Components.Label import Label from Components.ScrollLabel import ScrollLabel from enigma import eEPGCache, eTimer, eServiceReference -from ServiceReference import ServiceReference from RecordTimer import RecordTimerEntry, parseEvent from TimerEntry import TimerEntry -from time import localtime, asctime +from time import localtime class EventViewBase: def __init__(self, Event, Ref, callback=None, similarEPGCB=None): diff --git a/lib/python/Screens/HelpMenu.py b/lib/python/Screens/HelpMenu.py index 7bd52122..e6eab6b4 100644 --- a/lib/python/Screens/HelpMenu.py +++ b/lib/python/Screens/HelpMenu.py @@ -1,16 +1,8 @@ from Screen import Screen - -from Components.Pixmap import * -from Components.Pixmap import Pixmap -from Components.Pixmap import MovingPixmap +from Components.Pixmap import Pixmap, MovingPixmap from Components.Label import Label -from Components.Slider import Slider from Components.ActionMap import ActionMap from Components.HelpMenuList import HelpMenuList -import string -from xml.sax import make_parser -from xml.sax.handler import ContentHandler -from Components.MenuList import MenuList class HelpMenu(Screen): def __init__(self, session, list): diff --git a/lib/python/Screens/ImageWizard.py b/lib/python/Screens/ImageWizard.py index 461fa318..148eba52 100644 --- a/lib/python/Screens/ImageWizard.py +++ b/lib/python/Screens/ImageWizard.py @@ -1,8 +1,5 @@ from Wizard import Wizard, wizardManager -from Components.Pixmap import * - -from LanguageSelection import LanguageSelection from Tools.Directories import fileExists import os diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py index ba31a83a..92be7719 100644 --- a/lib/python/Screens/InfoBar.py +++ b/lib/python/Screens/InfoBar.py @@ -10,8 +10,6 @@ from Components.ActionMap import HelpableActionMap from Components.config import config from Components.ServiceEventTracker import ServiceEventTracker -from Tools.Notifications import AddNotificationWithCallback - from Screens.InfoBarGenerics import InfoBarShowHide, \ InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarRdsDecoder, \ InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarSeek, InfoBarInstantRecord, \ @@ -21,7 +19,7 @@ from Screens.InfoBarGenerics import InfoBarShowHide, \ InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \ InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport -from Screens.HelpMenu import HelpableScreen, HelpMenu +from Screens.HelpMenu import HelpableScreen from enigma import iPlayableService diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py index ca97b55f..8aeb7677 100644 --- a/lib/python/Screens/InfoBarGenerics.py +++ b/lib/python/Screens/InfoBarGenerics.py @@ -5,10 +5,9 @@ from Components.ActionMap import NumberActionMap from Components.BlinkingPixmap import BlinkingPixmapConditional from Components.Harddisk import harddiskmanager from Components.Input import Input -from Components.Label import * -from Components.Pixmap import Pixmap, PixmapConditional +from Components.Label import Label +from Components.Pixmap import Pixmap from Components.PluginComponent import plugins -from Components.ProgressBar import * from Components.ServiceEventTracker import ServiceEventTracker from Components.Sources.CurrentService import CurrentService from Components.Sources.EventInfo import EventInfo diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py index dbc6d480..81eb2d40 100644 --- a/lib/python/Screens/LanguageSelection.py +++ b/lib/python/Screens/LanguageSelection.py @@ -7,7 +7,7 @@ from Components.Sources.List import List from Tools.Directories import * -from enigma import eListboxPythonMultiContent, loadPNG, eListbox, gFont, RT_HALIGN_LEFT +from enigma import eListboxPythonMultiContent, loadPNG, gFont, RT_HALIGN_LEFT def LanguageEntryComponent(file, name, index): res = [ index ] diff --git a/lib/python/Screens/MediaPlayer.py b/lib/python/Screens/MediaPlayer.py index 84c75717..a378dafd 100644 --- a/lib/python/Screens/MediaPlayer.py +++ b/lib/python/Screens/MediaPlayer.py @@ -1,18 +1,16 @@ -import os -import time -from enigma import eTimer, iPlayableService, eServiceCenter, iServiceInformation, eSize +for os import path as os_path, os_remove, os_listdir +from time import strftime +from enigma import eTimer, iPlayableService, eServiceCenter, iServiceInformation from Screens.Screen import Screen from Screens.MessageBox import MessageBox from Screens.InputBox import InputBox -from Components.ActionMap import NumberActionMap, ActionMap, HelpableActionMap +from Components.ActionMap import NumberActionMap, HelpableActionMap from Components.Label import Label -from Components.Input import Input from Components.Pixmap import Pixmap from Components.Label import Label -from Components.FileList import FileEntryComponent, FileList -from Components.MediaPlayer import PlayList, PlaylistEntryComponent -from Plugins.Plugin import PluginDescriptor -from Tools.Directories import resolveFilename, SCOPE_MEDIA, SCOPE_CONFIG, SCOPE_PLAYLIST, SCOPE_SKIN_IMAGE +from Components.FileList import FileList +from Components.MediaPlayer import PlayList +from Tools.Directories import resolveFilename, SCOPE_CONFIG, SCOPE_PLAYLIST, SCOPE_SKIN_IMAGE from Components.ServicePosition import ServicePositionGauge from Components.ServiceEventTracker import ServiceEventTracker from Components.Playlist import PlaylistIOInternal, PlaylistIOM3U, PlaylistIOPLS @@ -20,7 +18,6 @@ from Screens.InfoBarGenerics import InfoBarSeek, InfoBarAudioSelection, InfoBarC from ServiceReference import ServiceReference from Screens.ChoiceBox import ChoiceBox from Screens.HelpMenu import HelpableScreen -from bisect import insort import random class MyPlayList(PlayList): @@ -237,9 +234,9 @@ class MediaPlayer(Screen, InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSup # Get rid of this...by finding the first "/" # FIXME: this should be fixed in the servicemp3.cpp handler filename = filename[filename.find("/"):] - path = os.path.dirname(filename) + path = os_path.dirname(filename) pngname = path + "/" + "folder.png" - if not os.path.exists(pngname): + if not os_path.exists(pngname): pngname = resolveFilename(SCOPE_SKIN_IMAGE, "no_coverArt.png") if self.coverArtFileName != pngname: self.coverArtFileName = pngname @@ -347,7 +344,7 @@ class MediaPlayer(Screen, InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSup if r is None: return text = r.getPath() - self["currenttext"].setText(os.path.basename(text)) + self["currenttext"].setText(os_path.basename(text)) if self.currList == "playlist": t = self.playlist.getSelection() @@ -419,7 +416,7 @@ class MediaPlayer(Screen, InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSup elif choice[1] == "copyfiles": self.stopEntry() self.playlist.clear() - self.copyDirectory(os.path.dirname(self.filelist.getSelection()[0].getPath()) + "/", recursive = False) + self.copyDirectory(os_path.dirname(self.filelist.getSelection()[0].getPath()) + "/", recursive = False) self.playServiceRefEntry(self.filelist.getServiceRef()) elif choice[1] == "playlist": self.switchToPlayList() @@ -484,7 +481,7 @@ class MediaPlayer(Screen, InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSup if name is not None: name = name.strip() if name == "": - name = time.strftime("%y%m%d_%H%M%S") + name = strftime("%y%m%d_%H%M%S") name += ".e2pls" self.playlistIOInternal.clear() for x in self.playlist.list: @@ -495,7 +492,7 @@ class MediaPlayer(Screen, InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSup listpath = [] playlistdir = resolveFilename(SCOPE_PLAYLIST) try: - for i in os.listdir(playlistdir): + for i in os_listdir(playlistdir): listpath.append((i,playlistdir + i)) except IOError,e: print "Error while scanning subdirs ",e @@ -515,7 +512,7 @@ class MediaPlayer(Screen, InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSup listpath = [] playlistdir = resolveFilename(SCOPE_PLAYLIST) try: - for i in os.listdir(playlistdir): + for i in os_listdir(playlistdir): listpath.append((i,playlistdir + i)) except IOError,e: print "Error while scanning subdirs ",e @@ -528,7 +525,7 @@ class MediaPlayer(Screen, InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSup def deleteConfirmed(self, confirmed): if confirmed: - os.remove(self.delname) + os_remove(self.delname) def clear_playlist(self): self.stopEntry() diff --git a/lib/python/Screens/Menu.py b/lib/python/Screens/Menu.py index 34c534b5..1b0ef1a3 100644 --- a/lib/python/Screens/Menu.py +++ b/lib/python/Screens/Menu.py @@ -2,9 +2,7 @@ from Screen import Screen from Components.Sources.List import List from Components.ActionMap import ActionMap from Components.Header import Header -from Components.Button import Button from Components.Label import Label -from Components.ProgressBar import ProgressBar from Components.config import configfile from Components.Sources.Clock import Clock from Components.PluginComponent import plugins @@ -12,8 +10,6 @@ from Components.PluginComponent import plugins from Tools.Directories import resolveFilename, SCOPE_SKIN import xml.dom.minidom -from xml.dom import EMPTY_NAMESPACE -from skin import elementsWithTag from Screens.Setup import Setup, getSetupTitle diff --git a/lib/python/Screens/MessageBox.py b/lib/python/Screens/MessageBox.py index 6fb389ce..0133de2a 100644 --- a/lib/python/Screens/MessageBox.py +++ b/lib/python/Screens/MessageBox.py @@ -1,10 +1,9 @@ from Screen import Screen from Components.ActionMap import ActionMap from Components.Label import Label -from Components.Button import Button from Components.Pixmap import Pixmap from Components.MenuList import MenuList -from enigma import eSize, ePoint, eTimer +from enigma import eTimer class MessageBox(Screen): TYPE_YESNO = 0 diff --git a/lib/python/Screens/MinuteInput.py b/lib/python/Screens/MinuteInput.py index d804570f..53e33735 100644 --- a/lib/python/Screens/MinuteInput.py +++ b/lib/python/Screens/MinuteInput.py @@ -1,11 +1,6 @@ from Screen import Screen from Components.ActionMap import NumberActionMap -from Components.Label import Label -from Components.Button import Button -from Components.Pixmap import Pixmap -from Components.MenuList import MenuList from Components.Input import Input -from enigma import eSize, ePoint class MinuteInput(Screen): def __init__(self, session, basemins = 5): diff --git a/lib/python/Screens/MovieSelection.py b/lib/python/Screens/MovieSelection.py index ab36adda..d345bddb 100644 --- a/lib/python/Screens/MovieSelection.py +++ b/lib/python/Screens/MovieSelection.py @@ -1,6 +1,5 @@ from Screen import Screen from Components.Button import Button -from Components.ServiceList import ServiceList from Components.ActionMap import ActionMap from Components.MovieList import MovieList from Components.DiskInfo import DiskInfo diff --git a/lib/python/Screens/Mute.py b/lib/python/Screens/Mute.py index 12ffbb31..f64be901 100644 --- a/lib/python/Screens/Mute.py +++ b/lib/python/Screens/Mute.py @@ -1,5 +1,4 @@ from Screen import Screen -from Components.VolumeBar import VolumeBar class Mute(Screen): def __init__(self, session): diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py index a2b15e93..9514e7fd 100644 --- a/lib/python/Screens/NetworkSetup.py +++ b/lib/python/Screens/NetworkSetup.py @@ -1,11 +1,11 @@ from Screen import Screen from Components.ActionMap import ActionMap -from Components.ConfigList import ConfigList, ConfigListScreen +from Components.ConfigList import ConfigListScreen from Components.config import config, getConfigListEntry from Components.Network import iNetwork from Components.Label import Label from Components.MenuList import MenuList -from Components.config import config, ConfigYesNo, ConfigIP, NoSave, ConfigSubsection, ConfigNothing +from Components.config import config, ConfigYesNo, ConfigIP, NoSave, ConfigNothing from Components.PluginComponent import plugins from Plugins.Plugin import PluginDescriptor diff --git a/lib/python/Screens/ParentalControlSetup.py b/lib/python/Screens/ParentalControlSetup.py index c0561b5d..f39afed0 100644 --- a/lib/python/Screens/ParentalControlSetup.py +++ b/lib/python/Screens/ParentalControlSetup.py @@ -1,17 +1,15 @@ from Screen import Screen -from Components.ConfigList import ConfigList, ConfigListScreen +from Components.ConfigList import ConfigListScreen from Components.ActionMap import NumberActionMap from Components.config import config, getConfigListEntry, ConfigNothing, NoSave, ConfigPIN -from Components.ServiceList import ServiceList from Components.ParentalControlList import ParentalControlEntryComponent, ParentalControlList from Components.ParentalControl import parentalControl from Screens.ChoiceBox import ChoiceBox from Screens.MessageBox import MessageBox -from Screens.InputBox import InputBox, Input, PinInput +from Screens.InputBox import PinInput from Screens.ChannelSelection import service_types_tv from Tools.BoundFunction import boundFunction -from ServiceReference import ServiceReference -from enigma import eServiceCenter, eServiceReference, eTimer +from enigma import eServiceCenter, eTimer from operator import itemgetter class ProtectedScreen: diff --git a/lib/python/Screens/PiPSetup.py b/lib/python/Screens/PiPSetup.py index 67c5b84b..d7d0e167 100644 --- a/lib/python/Screens/PiPSetup.py +++ b/lib/python/Screens/PiPSetup.py @@ -1,9 +1,6 @@ from Screens.Screen import Screen -from Screens.MessageBox import MessageBox from Components.ActionMap import NumberActionMap from Components.Label import Label -from Components.MenuList import MenuList -from Components.ChoiceList import ChoiceEntryComponent, ChoiceList # this is not so great. MAX_X = 720 diff --git a/lib/python/Screens/PluginBrowser.py b/lib/python/Screens/PluginBrowser.py index b3360b61..5459ccce 100644 --- a/lib/python/Screens/PluginBrowser.py +++ b/lib/python/Screens/PluginBrowser.py @@ -2,11 +2,9 @@ from Screen import Screen from enigma import eConsoleAppContainer, loadPNG -from Components.MenuList import MenuList from Components.ActionMap import ActionMap from Components.PluginComponent import plugins from Components.PluginList import * -from Components.config import config from Components.Label import Label from Screens.MessageBox import MessageBox from Screens.Console import Console diff --git a/lib/python/Screens/RdsDisplay.py b/lib/python/Screens/RdsDisplay.py index 4190b945..9b60fae9 100644 --- a/lib/python/Screens/RdsDisplay.py +++ b/lib/python/Screens/RdsDisplay.py @@ -1,6 +1,5 @@ -from enigma import iPlayableService, loadPNG, iRdsDecoder, ePoint, gRGB +from enigma import iPlayableService, loadPNG, iRdsDecoder from Screens.Screen import Screen -from Components.Sources.RdsDecoder import RdsDecoder from Components.ActionMap import NumberActionMap from Components.ServiceEventTracker import ServiceEventTracker from Components.Pixmap import Pixmap diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py index 29219721..644d1d96 100644 --- a/lib/python/Screens/Satconfig.py +++ b/lib/python/Screens/Satconfig.py @@ -1,6 +1,6 @@ from Screen import Screen from Components.ActionMap import ActionMap -from Components.ConfigList import ConfigList, ConfigListScreen +from Components.ConfigList import ConfigListScreen from Components.MenuList import MenuList from Components.NimManager import nimmanager from Components.config import getConfigListEntry, config, ConfigNothing diff --git a/lib/python/Screens/ScanSetup.py b/lib/python/Screens/ScanSetup.py index 351b421b..6bdedc87 100644 --- a/lib/python/Screens/ScanSetup.py +++ b/lib/python/Screens/ScanSetup.py @@ -1,9 +1,9 @@ from Screen import Screen -from ServiceScan import * +from ServiceScan import ServiceScan from Components.config import config, ConfigSubsection, ConfigSelection, \ - ConfigYesNo, ConfigInteger, getConfigListEntry, ConfigSlider, ConfigSatlist, ConfigEnableDisable + ConfigYesNo, ConfigInteger, getConfigListEntry, ConfigSlider, ConfigEnableDisable from Components.ActionMap import NumberActionMap -from Components.ConfigList import ConfigList, ConfigListScreen +from Components.ConfigList import ConfigListScreen from Components.NimManager import nimmanager, getConfigSatlist from Components.Label import Label from Screens.MessageBox import MessageBox diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py index cfcb5284..ed61d9d6 100644 --- a/lib/python/Screens/Screen.py +++ b/lib/python/Screens/Screen.py @@ -1,8 +1,7 @@ -from Components.HTMLSkin import * -from Components.GUISkin import * +from Components.HTMLSkin import HTMLSkin +from Components.GUISkin import GUISkin from Components.Sources.Source import Source - -import sys +from Components.GUIComponent import GUIComponent class Screen(dict, HTMLSkin, GUISkin): diff --git a/lib/python/Screens/ServiceInfo.py b/lib/python/Screens/ServiceInfo.py index 83cdcd5f..01cfc61a 100644 --- a/lib/python/Screens/ServiceInfo.py +++ b/lib/python/Screens/ServiceInfo.py @@ -1,9 +1,8 @@ -from Components.HTMLComponent import * -from Components.GUIComponent import * +from Components.HTMLComponent import HTMLComponent +from Components.GUIComponent import GUIComponent from Screen import Screen from Components.ActionMap import ActionMap from Components.Label import Label -from Components.MenuList import MenuList from ServiceReference import ServiceReference from enigma import eListboxPythonMultiContent, eListbox, gFont, iServiceInformation, eServiceCenter diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py index 432d8245..f6fb09bd 100644 --- a/lib/python/Screens/Setup.py +++ b/lib/python/Screens/Setup.py @@ -1,12 +1,11 @@ from Screen import Screen from Components.ActionMap import NumberActionMap -from Components.config import config, KEY_LEFT, KEY_RIGHT, KEY_OK -from Components.ConfigList import ConfigList, ConfigListScreen +from Components.config import config +from Components.ConfigList import ConfigListScreen from Components.Label import Label from Components.Pixmap import Pixmap import xml.dom.minidom -from xml.dom import EMPTY_NAMESPACE from skin import elementsWithTag from Tools import XMLTools diff --git a/lib/python/Screens/SleepTimerEdit.py b/lib/python/Screens/SleepTimerEdit.py index f582ff22..f724bc5f 100644 --- a/lib/python/Screens/SleepTimerEdit.py +++ b/lib/python/Screens/SleepTimerEdit.py @@ -5,8 +5,6 @@ from Components.Input import Input from Components.Label import Label from Components.Pixmap import Pixmap from Components.config import config -from SleepTimer import SleepTimerEntry -import time class SleepTimerEdit(Screen): def __init__(self, session): diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py index a4ba6042..b572bd80 100644 --- a/lib/python/Screens/Standby.py +++ b/lib/python/Screens/Standby.py @@ -2,7 +2,7 @@ from Screen import Screen from Components.ActionMap import ActionMap from Components.config import config from Components.AVSwitch import AVSwitch -from enigma import eDVBVolumecontrol, eDBoxLCD, eServiceReference +from enigma import eDVBVolumecontrol, eDBoxLCD from Components.Sources.Clock import Clock inStandby = None diff --git a/lib/python/Screens/StartWizard.py b/lib/python/Screens/StartWizard.py index b67ca9d4..1734d734 100644 --- a/lib/python/Screens/StartWizard.py +++ b/lib/python/Screens/StartWizard.py @@ -1,6 +1,6 @@ from Wizard import Wizard, wizardManager -from Components.Pixmap import * +from Components.Pixmap import Pixmap, MovingPixmap from Components.config import config, ConfigBoolean, configfile from LanguageSelection import LanguageSelection diff --git a/lib/python/Screens/Subtitles.py b/lib/python/Screens/Subtitles.py index ac2937ff..e3cdd71a 100644 --- a/lib/python/Screens/Subtitles.py +++ b/lib/python/Screens/Subtitles.py @@ -1,8 +1,7 @@ from Screen import Screen from Components.ActionMap import ActionMap -from Components.ConfigList import ConfigList, ConfigListScreen +from Components.ConfigList import ConfigListScreen from Components.config import config, getConfigListEntry, ConfigNothing -from Components.Label import Label from Tools.ISO639 import LanguageCodes diff --git a/lib/python/Screens/TimeDateInput.py b/lib/python/Screens/TimeDateInput.py index c50d8195..7f940909 100644 --- a/lib/python/Screens/TimeDateInput.py +++ b/lib/python/Screens/TimeDateInput.py @@ -1,8 +1,7 @@ from Screen import Screen -from Components.config import * -from Components.ActionMap import ActionMap, NumberActionMap -from Components.ConfigList import ConfigList, ConfigListScreen -from Components.Button import Button +from Components.config import ConfigClock, ConfigDateTime, getConfigListEntry +from Components.ActionMap import NumberActionMap +from Components.ConfigList import ConfigListScreen from Components.Label import Label from Components.Pixmap import Pixmap import time diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py index babf28fe..08bc12b3 100644 --- a/lib/python/Screens/TimerEdit.py +++ b/lib/python/Screens/TimerEdit.py @@ -1,6 +1,5 @@ from Components.ActionMap import ActionMap from Components.Button import Button -from Components.Label import Label from Components.MenuList import MenuList from Components.TimerList import TimerList, TimerEntryComponent from Components.TimerSanityCheck import TimerSanityCheck @@ -11,7 +10,7 @@ from Screens.MessageBox import MessageBox from ServiceReference import ServiceReference from TimerEntry import TimerEntry, TimerLog from Tools.BoundFunction import boundFunction -from time import * +from time import time class TimerEditList(Screen): def __init__(self, session): diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py index a54358f5..cc43a9af 100644 --- a/lib/python/Screens/TimerEntry.py +++ b/lib/python/Screens/TimerEntry.py @@ -1,15 +1,13 @@ from Screen import Screen import ChannelSelection from ServiceReference import ServiceReference -from Components.config import ConfigSelection, ConfigText, ConfigSubList, ConfigSubsection, ConfigDateTime, ConfigClock, ConfigYesNo, getConfigListEntry -from Components.ActionMap import ActionMap, NumberActionMap -from Components.ConfigList import ConfigList, ConfigListScreen +from Components.config import ConfigSelection, ConfigText, ConfigSubList, ConfigDateTime, ConfigClock, ConfigYesNo, getConfigListEntry +from Components.ActionMap import NumberActionMap +from Components.ConfigList import ConfigListScreen from Components.MenuList import MenuList from Components.Button import Button -from Components.NimManager import nimmanager from Components.Label import Label from Components.Pixmap import Pixmap -from Screens.MessageBox import MessageBox from Screens.ChoiceBox import ChoiceBox from RecordTimer import AFTEREVENT from enigma import eEPGCache diff --git a/lib/python/Screens/TutorialWizard.py b/lib/python/Screens/TutorialWizard.py index bab07f20..c90ed365 100644 --- a/lib/python/Screens/TutorialWizard.py +++ b/lib/python/Screens/TutorialWizard.py @@ -1,9 +1,7 @@ from Wizard import Wizard, wizardManager from Components.config import ConfigBoolean, config -from Components.Pixmap import * - -from LanguageSelection import LanguageSelection +from Components.Pixmap import MovingPixmap config.misc.firstruntutorial = ConfigBoolean(default = True) diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py index bd458273..1900e9a4 100644 --- a/lib/python/Screens/Wizard.py +++ b/lib/python/Screens/Wizard.py @@ -6,8 +6,7 @@ from Screens.HelpMenu import HelpableScreen from Components.config import config from Components.Label import Label from Components.Slider import Slider -from Components.ActionMap import HelpableActionMap, NumberActionMap -from Components.Pixmap import * +from Components.ActionMap import NumberActionMap from Components.MenuList import MenuList from Components.ConfigList import ConfigList diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py index 0a703e7c..975d3ade 100644 --- a/lib/python/Tools/Directories.py +++ b/lib/python/Tools/Directories.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -import os +from os import path as os_path, mkdir, system SCOPE_TRANSPONDERDATA = 0 SCOPE_SYSETC = 1 @@ -49,7 +49,7 @@ def resolveFilename(scope, base = "", path_prefix = None): if base[0:2] == "~/": # you can only use the ~/ if we have a prefix directory assert path_prefix is not None - base = os.path.join(path_prefix, base[2:]) + base = os_path.join(path_prefix, base[2:]) # don't resolve absolute paths if base[0:1] == '/': @@ -59,7 +59,7 @@ def resolveFilename(scope, base = "", path_prefix = None): if path[1] == PATH_CREATE: if (not pathExists(defaultPaths[scope][0])): - os.mkdir(path[0]) + mkdir(path[0]) #if len(base) > 0 and base[0] == '/': #path = ("", None) @@ -70,21 +70,21 @@ def resolveFilename(scope, base = "", path_prefix = None): for x in fallbackPaths[scope]: if x[1] == FILE_COPY: if fileExists(x[0] + base): - os.system("cp " + x[0] + base + " " + path[0] + base) + system("cp " + x[0] + base + " " + path[0] + base) break elif x[1] == FILE_MOVE: if fileExists(x[0] + base): - os.system("mv " + x[0] + base + " " + path[0] + base) + system("mv " + x[0] + base + " " + path[0] + base) break elif x[1] == PATH_COPY: if pathExists(x[0]): if not pathExists(defaultPaths[scope][0]): - os.mkdir(path[0]) - os.system("cp -a " + x[0] + "* " + path[0]) + mkdir(path[0]) + system("cp -a " + x[0] + "* " + path[0]) break elif x[1] == PATH_MOVE: if pathExists(x[0]): - os.system("mv " + x[0] + " " + path[0]) + system("mv " + x[0] + " " + path[0]) break @@ -94,11 +94,11 @@ def resolveFilename(scope, base = "", path_prefix = None): # this is only the BASE - an extension must be added later. def pathExists(path): - return os.path.exists(path) + return os_path.exists(path) def createDir(path): try: - os.mkdir(path) + mkdir(path) except: ret = 0 else: diff --git a/lib/python/Tools/FuzzyDate.py b/lib/python/Tools/FuzzyDate.py index dac72cf0..93990290 100644 --- a/lib/python/Tools/FuzzyDate.py +++ b/lib/python/Tools/FuzzyDate.py @@ -1,9 +1,9 @@ -import time +from time import localtime, time def FuzzyTime(t): - d = time.localtime(t) - nt = time.time() - n = time.localtime() + d = localtime(t) + nt = time() + n = localtime() if d[:3] == n[:3]: # same day @@ -22,18 +22,18 @@ def FuzzyTime(t): return (date, timeres) if __name__ == "__main__": - print "now: %s %s" % FuzzyTime(time.time()) - print "1 day: %s %s" % FuzzyTime(time.time() + 86400) - print "2 days: %s %s" % FuzzyTime(time.time() + 86400 *2) - print "2 days: %s %s" % FuzzyTime(time.time() + 86400 *3) - print "2 days: %s %s" % FuzzyTime(time.time() + 86400 *4) - print "2 days: %s %s" % FuzzyTime(time.time() + 86400 *5) - print "2 days: %s %s" % FuzzyTime(time.time() + 86400 *6) - print "2 days: %s %s" % FuzzyTime(time.time() + 86400 *7) - print "2 days: %s %s" % FuzzyTime(time.time() + 86400 *8) - print "2 days: %s %s" % FuzzyTime(time.time() + 86400 *9) - print "2 days: %s %s" % FuzzyTime(time.time() + 86400 *10) - print "2 days: %s %s" % FuzzyTime(time.time() + 86400 *11) - print "2 days: %s %s" % FuzzyTime(time.time() + 86400 *12) - print "2 days: %s %s" % FuzzyTime(time.time() + 86400 *13) - print "2 days: %s %s" % FuzzyTime(time.time() + 86400 *14) + print "now: %s %s" % FuzzyTime(time()) + print "1 day: %s %s" % FuzzyTime(time() + 86400) + print "2 days: %s %s" % FuzzyTime(time() + 86400 *2) + print "2 days: %s %s" % FuzzyTime(time() + 86400 *3) + print "2 days: %s %s" % FuzzyTime(time() + 86400 *4) + print "2 days: %s %s" % FuzzyTime(time() + 86400 *5) + print "2 days: %s %s" % FuzzyTime(time() + 86400 *6) + print "2 days: %s %s" % FuzzyTime(time() + 86400 *7) + print "2 days: %s %s" % FuzzyTime(time() + 86400 *8) + print "2 days: %s %s" % FuzzyTime(time() + 86400 *9) + print "2 days: %s %s" % FuzzyTime(time() + 86400 *10) + print "2 days: %s %s" % FuzzyTime(time() + 86400 *11) + print "2 days: %s %s" % FuzzyTime(time() + 86400 *12) + print "2 days: %s %s" % FuzzyTime(time() + 86400 *13) + print "2 days: %s %s" % FuzzyTime(time() + 86400 *14) diff --git a/lib/python/Tools/RedirectTime.py b/lib/python/Tools/RedirectTime.py index 91c80022..e69de29b 100644 --- a/lib/python/Tools/RedirectTime.py +++ b/lib/python/Tools/RedirectTime.py @@ -1,18 +0,0 @@ -import time -from enigma import eDVBLocalTimeHandler - -org_time = time.time -time_difference = eDVBLocalTimeHandler.getInstance().difference() - -def myTime(): - global time_difference - t = org_time() - t += time_difference - return t - -def timeChangedCallback(): - global time_difference - time_difference = eDVBLocalTimeHandler.getInstance().difference() - -eDVBLocalTimeHandler.getInstance().m_timeUpdated.get().append(timeChangedCallback) -time.time = myTime
\ No newline at end of file diff --git a/lib/python/Tools/__init__.py b/lib/python/Tools/__init__.py index df8d8873..ae2e875e 100644 --- a/lib/python/Tools/__init__.py +++ b/lib/python/Tools/__init__.py @@ -1,2 +1,5 @@ all = ["RedirectTime.py", "FuzzyDate.py", "XMLTools.py", "Directories.py", "KeyBindings.py", "BoundFunction.py", "ISO639.py", "Notifications", "RedirectOutput.py", "DreamboxHardware.py"] + +import RedirectTime +import RedirectOutput
\ No newline at end of file @@ -1,4 +1,3 @@ -from Tools import RedirectOutput, RedirectTime from enigma import runMainloop, eDVBDB, eTimer, quitMainloop, eDVBVolumecontrol, \ getDesktop, ePythonConfigQuery, eAVSwitch, eWindow, eServiceEvent from tools import * @@ -17,8 +16,6 @@ from Screens.SimpleSummary import SimpleSummary from sys import stdout, exc_info -import ServiceReference - from Components.ParentalControl import InitParentalControl InitParentalControl() @@ -551,8 +548,6 @@ Components.SetupDevices.InitSetupDevices() import Components.RFmod Components.RFmod.InitRFmod() -import Components.NimManager - import Screens.Ci Screens.Ci.InitCiConfig() @@ -1,12 +1,10 @@ import xml.dom.minidom -from xml.dom import EMPTY_NAMESPACE from os import path from enigma import eSize, ePoint, gFont, eWindow, eLabel, ePixmap, eWindowStyleManager, \ loadPNG, addFont, gRGB, eWindowStyleSkinned from Components.config import ConfigSubsection, ConfigText, config -from Components.Element import Element from Components.Converter.Converter import Converter from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCOPE_FONTS from Tools.Import import my_import diff --git a/tests/enigma.py b/tests/enigma.py index 11c5b233..bf232628 100644 --- a/tests/enigma.py +++ b/tests/enigma.py @@ -359,7 +359,5 @@ def init_all(): import Components.RFmod Components.RFmod.InitRFmod() - import Components.NimManager - import Screens.Ci Screens.Ci.InitCiConfig() @@ -1,8 +1,6 @@ from bisect import insort -from time import strftime, time, localtime, gmtime, mktime -from calendar import timegm +from time import strftime, time, localtime, mktime from enigma import eTimer -import calendar import datetime class TimerEntry: |