cleanup some imports
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>
Sun, 22 Jul 2007 09:54:05 +0000 (09:54 +0000)
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>
Sun, 22 Jul 2007 09:54:05 +0000 (09:54 +0000)
118 files changed:
Navigation.py
RecordTimer.py
ServiceReference.py
e2reactor.py
lib/actions/parseactions.py
lib/python/Components/AVSwitch.py
lib/python/Components/BlinkingPixmap.py
lib/python/Components/Button.py
lib/python/Components/ChoiceList.py
lib/python/Components/Clock.py
lib/python/Components/ConditionalWidget.py
lib/python/Components/ConfigList.py
lib/python/Components/DiskInfo.py
lib/python/Components/EpgList.py
lib/python/Components/FileList.py
lib/python/Components/GUISkin.py
lib/python/Components/Header.py
lib/python/Components/HelpMenuList.py
lib/python/Components/Input.py
lib/python/Components/Label.py
lib/python/Components/MediaPlayer.py
lib/python/Components/MenuList.py
lib/python/Components/MovieList.py
lib/python/Components/Network.py
lib/python/Components/NimManager.py
lib/python/Components/ParentalControl.py
lib/python/Components/ParentalControlList.py
lib/python/Components/PerServiceDisplay.py
lib/python/Components/PluginList.py
lib/python/Components/ProgressBar.py
lib/python/Components/RecordingConfig.py
lib/python/Components/Renderer/Listbox.py
lib/python/Components/ScrollLabel.py
lib/python/Components/ServiceEventTracker.py
lib/python/Components/ServiceList.py
lib/python/Components/ServiceScan.py
lib/python/Components/SetupDevices.py
lib/python/Components/Slider.py
lib/python/Components/Sources/Clock.py
lib/python/Components/Sources/CurrentService.py
lib/python/Components/Sources/EventInfo.py
lib/python/Components/Sources/FrontendStatus.py
lib/python/Components/Sources/List.py
lib/python/Components/Sources/StaticText.py
lib/python/Components/TimerList.py
lib/python/Components/TimerSanityCheck.py
lib/python/Components/VariableText.py
lib/python/Components/VariableValue.py
lib/python/Components/VolumeBar.py
lib/python/Components/components.py
lib/python/Plugins/DemoPlugins/TestPlugin/plugin.py
lib/python/Plugins/Extensions/CutListEditor/plugin.py
lib/python/Plugins/Extensions/FileManager/plugin.py
lib/python/Plugins/Extensions/FritzCall/plugin.py
lib/python/Plugins/Extensions/PicturePlayer/plugin.py
lib/python/Plugins/Extensions/SimpleRSS/plugin.py
lib/python/Plugins/Extensions/WebInterface/.cvsignore [deleted file]
lib/python/Plugins/Extensions/WebInterface/Makefile.am [deleted file]
lib/python/Plugins/Extensions/WebInterface/__init__.py [deleted file]
lib/python/Plugins/Extensions/WebInterface/plugin.py [deleted file]
lib/python/Plugins/Extensions/WebInterface/web-data/Makefile.am [deleted file]
lib/python/Plugins/Extensions/WebInterface/web-data/tools.js [deleted file]
lib/python/Plugins/Extensions/WebInterface/web/Makefile.am [deleted file]
lib/python/Plugins/Extensions/WebInterface/web/index.html.xml [deleted file]
lib/python/Plugins/Extensions/WebInterface/web/stream.m3u.xml [deleted file]
lib/python/Plugins/Extensions/WebInterface/web/stream.xml [deleted file]
lib/python/Plugins/Extensions/WebInterface/web/zap.xml [deleted file]
lib/python/Plugins/Extensions/WebInterface/webif.py [deleted file]
lib/python/Plugins/SystemPlugins/ConfigurationBackup/plugin.py
lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py
lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py
lib/python/Plugins/SystemPlugins/SoftwareUpdate/plugin.py
lib/python/Screens/About.py
lib/python/Screens/ChannelSelection.py
lib/python/Screens/ChoiceBox.py
lib/python/Screens/Ci.py
lib/python/Screens/Console.py
lib/python/Screens/EpgSelection.py
lib/python/Screens/EventView.py
lib/python/Screens/HelpMenu.py
lib/python/Screens/ImageWizard.py
lib/python/Screens/InfoBar.py
lib/python/Screens/InfoBarGenerics.py
lib/python/Screens/LanguageSelection.py
lib/python/Screens/MediaPlayer.py
lib/python/Screens/Menu.py
lib/python/Screens/MessageBox.py
lib/python/Screens/MinuteInput.py
lib/python/Screens/MovieSelection.py
lib/python/Screens/Mute.py
lib/python/Screens/NetworkSetup.py
lib/python/Screens/ParentalControlSetup.py
lib/python/Screens/PiPSetup.py
lib/python/Screens/PluginBrowser.py
lib/python/Screens/RdsDisplay.py
lib/python/Screens/Satconfig.py
lib/python/Screens/ScanSetup.py
lib/python/Screens/Screen.py
lib/python/Screens/ServiceInfo.py
lib/python/Screens/Setup.py
lib/python/Screens/SleepTimerEdit.py
lib/python/Screens/Standby.py
lib/python/Screens/StartWizard.py
lib/python/Screens/Subtitles.py
lib/python/Screens/TimeDateInput.py
lib/python/Screens/TimerEdit.py
lib/python/Screens/TimerEntry.py
lib/python/Screens/TutorialWizard.py
lib/python/Screens/Wizard.py
lib/python/Tools/Directories.py
lib/python/Tools/FuzzyDate.py
lib/python/Tools/RedirectTime.py
lib/python/Tools/__init__.py
mytest.py
skin.py
tests/enigma.py
timer.py

index cde4ca4c33f1496809bb3698158673d1f5104734..7b1deb030d049b6ed9dad5223f4c6149611c5d45 100644 (file)
@@ -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):
index 1c707c362ca897f64984764a8c29a309c7eb0577..765e1334ce8a2d252dd921d075b071a59f427a55 100644 (file)
@@ -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
 
index f7aa6397a4290a6333d79b2521afe395cfa813c8..11e287860991488d8c332faccee62dedace8caa3 100644 (file)
@@ -1,7 +1,5 @@
 from enigma import eServiceReference, eServiceCenter
 
-import NavigationInstance
-
 class ServiceReference(eServiceReference):
        def __init__(self, ref):
                if not isinstance(ref, eServiceReference):
index 4f069f91622c52717e281f37a1684aa1087f0618..a3d8ce1907794f39795a648d2bbb4c104cb0ecb3 100644 (file)
@@ -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
 
index d0c1aec374c9ab2c498d98771f1dade63f6737df..4ab71af79aa306cc47a9953e9ea658c66798ec38 100644 (file)
@@ -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:
index 67fad7bc62d3fe4d498cae7e915ae735a7ce2763..d3224fd703b41b32e4d26b869fe95da0f59ae09f 100644 (file)
@@ -1,5 +1,4 @@
 from config import config, ConfigSelection, ConfigYesNo, ConfigEnableDisable, ConfigSubsection, ConfigBoolean
-import os
 from enigma import eAVSwitch
 
 class AVSwitch:
index fef80620ffa71a07eb8ec9a6c4e56c80085da821..492f14e1ac725cbfe6d548ad8d11f787dd0fc60a 100644 (file)
@@ -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):
index f1acb99d8c1ef5aef102a01d5967ec97b1cc7973..25346b42f055dd19bd8bfae74eb0e9aed1ac68d6 100644 (file)
@@ -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
 
index a7a5e4831eee0a222a0d792fc062199e0ad15136..14216cf1a24d9a87ee59359237ff636f8f975c86 100644 (file)
@@ -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
index 9a6031e6d57ce2b0ee447d7823133676830ceaaa..ddd6ffb1dcab30dc4ec58506cc27f08b9779fb83 100644 (file)
@@ -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
 
index 7d35d9565ca2eb5556217cb47d26012ba2e31afe..f826c296eb90c4527e68298bada5cdd735099212 100644 (file)
@@ -1,4 +1,4 @@
-from GUIComponent import *
+from GUIComponent import GUIComponent
 from enigma import eTimer
 
 class ConditionalWidget(GUIComponent):
index 534459e4e4b9fddcb10a9896d554848a8cf6e1ce..7ed6031a7fbc7612e5a26c54c93125f29793b037 100644 (file)
@@ -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
index ba04ea49c7bec91cd3b40096f48921f3c37b3668..07a6aa4b44a9c06dd090492e5e3ec7c6a31c4366 100644 (file)
@@ -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
index 4a182322b60bd3ac079a7f98f0f2bfa6b33f6b48..23d7784688aef3adaac585c400ea7e34861db809 100644 (file)
@@ -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
index 3b02817c6e73308473d036c12b5f5520ad4fdd4f..ae171c305153968edfcebf842984a0f083a84794 100644 (file)
@@ -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
index fc8f38cb9bc0dcf75fb6e2a48bb50281a7e4b883..0fb94214ff4c7529cea3c53f5e6104bd2d3aa912 100644 (file)
@@ -1,4 +1,4 @@
-from GUIComponent import *
+from GUIComponent import GUIComponent
 from skin import applyAllAttributes
 from Tools.CList import CList
 
index 6f085c15e023fa7cba151dbb0e86f13a1324dcfd..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
@@ -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
index 99bd536db3d53bf0968d6e476358b386ed2e8f27..07bbdd2a9a1f2127f51be98ce4cbecc956e073ac 100644 (file)
@@ -1,4 +1,4 @@
-from GUIComponent import *
+from GUIComponent import GUIComponent
 
 from enigma import eListboxPythonMultiContent, eListbox, gFont
 
index b30a74e4cc2b3e5d8815373168e4d5a33ae52fa1..e0a7f44972549c961c9f116fff5597cfefcec5ef 100644 (file)
@@ -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
 
index 4d90badc58b03085fc6aab0eb739ec138c70cb16..7e61275b228d7a4c2b0cce7517779ab3d6fa0a5a 100644 (file)
@@ -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
 
index ec0000c9fa4d5958cb86e545ea749fc515738741..a728aef77a5ce0d7ff8bad636e0011b0cdcb7af9 100644 (file)
@@ -1,5 +1,5 @@
-from HTMLComponent import *
-from GUIComponent import *
+from HTMLComponent import HTMLComponent
+from GUIComponent import GUIComponent
 
 from MenuList import MenuList
 
index dcbe7c1a45ea12ed93236d1ead3bfb152d36d62e..876300bd615a59741c574d1a25558bfe60002ed7 100644 (file)
@@ -1,5 +1,5 @@
-from HTMLComponent import *
-from GUIComponent import *
+from HTMLComponent import HTMLComponent
+from GUIComponent import GUIComponent
 
 from enigma import eListboxPythonStringContent, eListbox
 
index 45a34fb967f0c22b42461916004acc3ed97f7ee1..d43b510646c5251a43eae542b9084ac1bc1cacbc 100644 (file)
@@ -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
index a8c75907ddfff25639306f3478c744fb23ed25d2..6fbd99945e57c2eb71f1147696c9aaf3b66698f7 100644 (file)
@@ -1,5 +1,3 @@
-from Components.config import config, ConfigYesNo, ConfigIP, NoSave, ConfigSubsection, ConfigMAC
-
 import os
 import re
 from socket import *
index 70ce4dbe6b576947e5b9a380bdec198d0d87d17a..22c99520a8b5c669c6aa04483e07ba55e2327725 100644 (file)
@@ -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
 
index bf971813b5782a214dcedda053d28e486945d92d..8c8a3305cc64c18217b12a8b7ac10ea6990cf5ce 100644 (file)
@@ -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
index db8fd8e27dbdeb6de68bb0d64d95fc1801aa32fa..f518555075253193945eee4a55713f309c29de13 100644 (file)
@@ -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
index 27f151715e182c81bb9ff628ee466785fc9f865c..6e02cce99ad0c1bf4ad7cc0c4ab39d70437ecd6f 100644 (file)
@@ -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
index 07a7174820eccc522717bdce227ba6bcf3f18f3b..3a3bef1e3437b4afd4fbc25788a9fcdff74b7098 100644 (file)
@@ -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 ]
index f18c4672ac11513cbc1087d18ebcc3fdca3ebe06..d97ac832b16cfd988bda01c9d468eca9cd0a32e1 100644 (file)
@@ -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
 
index 6a3bfb68328915ea2be7c58f781aca41aba499b0..d3a0daf2edbf4e52b21c1856b02818a9874b86bb 100644 (file)
@@ -1,5 +1,4 @@
 from config import ConfigInteger, ConfigYesNo, ConfigSubsection, config
-import os
 
 def InitRecordingConfig():
        config.recording = ConfigSubsection();
index a1f893777d97ccf1231db9879d0e6e2bae1ab4d0..ef8206af22c562ed33d109722b7ecbde2dca84a1 100644 (file)
@@ -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.
index 85e176f635272ed9f6dcaf1163a9d38f18a7391b..aa5163b866e46788e621c37adcf413910a6e0eeb 100644 (file)
@@ -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):
index 99c02faa444643b29085ce103acfd0edd4a8468e..204604368a400960ceccf4e514a1bae1fe13921c 100644 (file)
@@ -1,5 +1,3 @@
-from enigma import pNavigation
-
 class ServiceEventTracker:
        """Tracks service events into a screen"""
        
index 7dfcd05d51c700de02efa76d8a929e29d3eb8ef9..b255cd99641ae8344f2badd5dd5d346448ea2667 100644 (file)
@@ -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
index d812fddba75dd50b2ed0c728bd4e8245556c024a..09498713ff0c8e9e403328f2be187b5098806abc 100644 (file)
@@ -1,4 +1,4 @@
-from enigma import eComponentScan, eDVBFrontendParametersSatellite, eDVBFrontendParametersCable, eDVBFrontendParametersTerrestrial
+from enigma import eComponentScan
 
 class ServiceScan:
        
index 546d04a748dc0c3e8bbbf2afa8d2ee9d3718d6da..71fb1e475b48aa417df55bab9bb52ad3d6ab2693 100644 (file)
@@ -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
 
index b8144bb5ee45e3d56082bd78f177f7df6fbf8b91..a36a573aeaeb053edaf151a54d955298da4aa5d3 100644 (file)
@@ -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
 
index 4833dddec9212a17d108df7a6948784aa1b2103a..4c4b41e6c34706b9539b1b0ff56a82dffdad4a34 100644 (file)
@@ -1,4 +1,3 @@
-from Tools.Event import Event
 from Components.Element import cached
 from enigma import eTimer
 import time
index 8e582d55f224c4a3a244e052fd2e9a3d75b6d4b9..acc624a2860a433b22db5c2877a8ba9762c11518 100644 (file)
@@ -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)
index 72d5f18d19eb4bd797426a35c0b503cab6a61f5f..a4bc874f534e3812b839fa71d67002fbafc64130 100644 (file)
@@ -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
index 1af03f95574da03fb3290a9f3ab247a557bf4734..5b7e5b0c3a33da9d5ecb4eccb9f069d998b16a28 100644 (file)
@@ -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):
index e141da59fcb9a3a1ab1bfa0088c04219c537dd1b..d7221296f7cfa364ee89bead5332bf8c50dfb96e 100644 (file)
@@ -1,5 +1,4 @@
 from Source import Source
-from Tools.Event import Event
 from Components.Element import cached
 
 class List(Source, object):
index 2f8f0e184d617f78bcb2f28c294602814d106aa4..6f775c443b0aa2c44a6116bc461dbe5ec82122dd 100644 (file)
@@ -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
index c732e947a5a6bf7a9a1ca217daefd4b4a70b630a..e31a0f4a46664c1a199dcc62a0cc32aa519f3dcd 100644 (file)
@@ -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
 
index 35e78de0f9c395073ef3bcf54fcf4463c2ecad25..50daa2f1015780c3cd1efdf01cd429305e248bf5 100644 (file)
@@ -1,4 +1,3 @@
-from Components.NimManager import nimmanager
 from time import localtime
 
 class TimerSanityCheck:
index bb8b5fe326e96f1f8f5898f1812293df0c58a288..d20e51938555c94b5cc972adfada3bb3fb71b413 100644 (file)
@@ -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"""
        
index 288de01a43431aea06307f21a7d63a8d66c97bef..7fde0af1730b65473eed3db53d8b7843469fe34d 100644 (file)
@@ -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"""
        
index c51bdb1913b2369ef5dff55c7be245a3293c1b4d..1ada3c69f35c0d0f27ec8a2300b65ad4840b8af0 100644 (file)
@@ -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):
index 87159bf698672c11f39fa434886695d52c85fb4c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
@@ -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 
index dae4d4abb7537b9c7b92219663824e75d9229809..5456fb1867eedd86b2b7f99f2545635c66fc5268 100644 (file)
@@ -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
 
index 4c425532dc69ba8edb285a1737967023086a34b9..200e37ccc639ec21742d5ac134c9b07ef48d381c 100644 (file)
@@ -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
index 3cbef3437a565b4d6190e4138120ebb34f4e7e8d..09a20e063a14b4763beb918ffb79e8f089ca34fb 100644 (file)
@@ -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):
index 339f2dd1cdb9a69b17fcd2bc55ad5fafdffd91e8..0b67345bbd339adb124622f8ebba2b92cbc4f477 100644 (file)
@@ -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)
                
index 8a5910903e035aff654c438fb685915c9a611c07..c54669bb5d60dafffead06ac3db1c708110c28ef 100644 (file)
@@ -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
index 49da5e632ae86a898d7684273d797389cdc1554b..980fe5d53830ea96c046f26603ce25ce2d4007cf 100644 (file)
@@ -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 (file)
index 138b9cc..0000000
+++ /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 (file)
index e69de29..0000000
diff --git a/lib/python/Plugins/Extensions/WebInterface/__init__.py b/lib/python/Plugins/Extensions/WebInterface/__init__.py
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/lib/python/Plugins/Extensions/WebInterface/plugin.py b/lib/python/Plugins/Extensions/WebInterface/plugin.py
deleted file mode 100644 (file)
index e69de29..0000000
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 (file)
index e69de29..0000000
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 (file)
index e69de29..0000000
diff --git a/lib/python/Plugins/Extensions/WebInterface/web/Makefile.am b/lib/python/Plugins/Extensions/WebInterface/web/Makefile.am
deleted file mode 100644 (file)
index e69de29..0000000
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 (file)
index e69de29..0000000
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 (file)
index e69de29..0000000
diff --git a/lib/python/Plugins/Extensions/WebInterface/web/stream.xml b/lib/python/Plugins/Extensions/WebInterface/web/stream.xml
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/lib/python/Plugins/Extensions/WebInterface/web/zap.xml b/lib/python/Plugins/Extensions/WebInterface/web/zap.xml
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/lib/python/Plugins/Extensions/WebInterface/webif.py b/lib/python/Plugins/Extensions/WebInterface/webif.py
deleted file mode 100644 (file)
index e69de29..0000000
index d225cd000d1d43cbc4991d8d4a17a25e0e691bf1..89f979fe6648c3d4301d78e36b181f59676e6489 100644 (file)
@@ -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
index 0f6c4e846cdb6ec197332d9f02bc5255f5bc41fc..17abb0ffc20bcb52b6c15687e9cab0c601392b93 100644 (file)
@@ -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
index 1a520771e2ba96b7b703d30dd8971fa67897129e..f3fb35ebf9f5200aad7505dae67b6f1147fe18dd 100644 (file)
@@ -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):
index adeff0713ff86772fd9348e39a1633c8c553484b..fdb2683418f48caa735b1f0024d880af4b574f3b 100755 (executable)
@@ -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
index c71ffdbb59ab77015de26c1aab0a6cc6afcb5b05..505b0cddb58fd1fa1c31b25cc62bf879dbd4f759 100644 (file)
@@ -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
index 6658bb1a4bee43fc0a0874253e23ca2df211105e..2c7d98f539b4aa848fa202c72c37a9713069c842 100644 (file)
@@ -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
index eb6f90593775dc7ae2a693856e50de7c7ea28acc..0fe625bb9d56846376ae6e39714115c031cde495 100644 (file)
@@ -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)
index b1d74ad54db88960ed29025e1834fb5aacbd56f3..0436f66d0152993fff3076e0614b07bf27f86f8b 100644 (file)
@@ -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):
index b6f315b418dfdb9fd732cd3c592b6554c075d118..46b0779429425420b2e8dc54706007b1889b66e2 100644 (file)
@@ -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
 
index 03b0249b3d4b3eb7852233bf35df0bdd313181c8..c2e1688d593f29a4db13c862af7d2190173d485b 100644 (file)
@@ -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):
index 3103bfa71743266a770336b6f220006a56803006..9ceb42cfc374c30a597fc17dcd20e99df9697bdf 100644 (file)
@@ -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):
index 8504165db222f1faedfcc610ea12dbb349fe0176..7746b135a29a48423fafb7d2a248ad5efe9f5ed0 100644 (file)
@@ -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):
index 7bd52122306db9ec44b9194fffc5d9037b6cdbfc..e6eab6b4c379dfc8dc2869bbd516124d7b4ae4f6 100644 (file)
@@ -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):
index 461fa31886cf274b6d6e0063dc1be606f1c54a10..148eba52ba85b89f7d162109b266feee5ef3dc3f 100644 (file)
@@ -1,8 +1,5 @@
 from Wizard import Wizard, wizardManager
 
-from Components.Pixmap import *
-
-from LanguageSelection import LanguageSelection
 from Tools.Directories import fileExists
 
 import os
index ba31a83a4a0dfa17435cce264f59bfe7edbef421..92be77196e99477571461468115f77ef5bc7abb0 100644 (file)
@@ -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
 
index ca97b55fa81425ca3a4e11950cd818b617439355..8aeb767718b9cde2e81e084b845a89d9d62bc69c 100644 (file)
@@ -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
index dbc6d480e158e60cc7c31c40df5d408a8745fdfa..81eb2d40f0fb6ff229cca84439dd45a7591590f2 100644 (file)
@@ -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 ]
index 84c75717e17c19a4061916b8cfe76e892b2919cc..a378dafdc7acb375fc718086a34ae2a79aa29fff 100644 (file)
@@ -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()
index 34c534b5a1fefa6398bc55e644e74756901d73e2..1b0ef1a309b3a904c018da5f4c1dceb1606822fc 100644 (file)
@@ -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
 
index 6fb389ce00f9d141a6b8e59315216a25d6f80012..0133de2a5038e1ebc9086b63375c6a541b901f6a 100644 (file)
@@ -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
index d804570fcf4b6154ab2dd2f0c2061b44c5fd4c21..53e337350920411b562cf466203080e468a431af 100644 (file)
@@ -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):
index ab36adda36e7e734678fd688a8b0369fe4410124..d345bddb1288924cc1f84a2eb55d7caab523d55a 100644 (file)
@@ -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
index 12ffbb3167bfdc9eb370a18b3a7fd6f28e40c600..f64be90176cd25845d55573e66c436c2a450cb71 100644 (file)
@@ -1,5 +1,4 @@
 from Screen import Screen
-from Components.VolumeBar import VolumeBar
 
 class Mute(Screen):
        def __init__(self, session):
index a2b15e935e7e6976dc8d564c5b5ebd1109abbf35..9514e7fd43a15e3f03e975791cdab6d5f615b44f 100644 (file)
@@ -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
 
index c0561b5deb0acb81d9109c8b02478c397a464091..f39afed0f16cba80dab501d3a12301acde8bde10 100644 (file)
@@ -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:
index 67c5b84b472858d655ef48f58dc343279189e671..d7d0e167f713f9890b212c23ca502cc2998dbca7 100644 (file)
@@ -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
index b3360b618add3c7b09c1afe46e2d68c48db5563f..5459ccce7857c056709ffb2dfa1096cd3832c444 100644 (file)
@@ -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
index 4190b9452822c35114c8fd6a5c305de653d2e88b..9b60fae95e2e1092309d4e3e3c83686d5b94f272 100644 (file)
@@ -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
index 2921972165860fddc95501944cbef9ab2edbec00..644d1d96675f4daec6040a394986d52c79db2acc 100644 (file)
@@ -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
index 351b421b1df7ea75d7faa420d253429e3a213995..6bdedc8738a70e203d7abfc0c74302a603594525 100644 (file)
@@ -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
index cfcb52840e4e4a558cb2a12089f63e95ed42610b..ed61d9d68bce68e615d4181bc2564a7cfaa156d9 100644 (file)
@@ -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):
 
index 83cdcd5f37baa078a707b7f09d777d517f2daaf2..01cfc61aac6ad4898dc55dcb09429333620ef9ee 100644 (file)
@@ -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
 
index 432d82455386cd039272e2f159aec63ae05d0ccb..f6fb09bdc90ceb270c9966a4058ceb79a9df8497 100644 (file)
@@ -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
index f582ff2269935e499fc34ed3149487853a3939a9..f724bc5f7bbf369f6c3ec5df4cab00816cf9312a 100644 (file)
@@ -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):
index a4ba60425122409b40c50071dfff9df91c919534..b572bd80e84c6620b8965ce27d5515d9c57d8fd6 100644 (file)
@@ -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
index b67ca9d47a76f789819e13aff9455d9c35b32529..1734d7341da43cf98a4ac28319058e9feb09d20a 100644 (file)
@@ -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
index ac2937ff867eba8604e40b379f9ed081262a2cfd..e3cdd71a4f58c79e3de56674488b52fea07d8776 100644 (file)
@@ -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
 
index c50d8195aaeb743131c140d31a49f9f87a9cddc5..7f94090946f0ade8d48c125ac0bb9243ab555e40 100644 (file)
@@ -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
index babf28fe6cc0e8ba042196432a8f117d2785647e..08bc12b324e9e2b3db57ece70515fb0c8dd3bf73 100644 (file)
@@ -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):
index a54358f50fa97199b2eb28b25c1ef3b8796c2d4a..cc43a9afaba42ab0605e5c162ae1bb674d387a0a 100644 (file)
@@ -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
index bab07f2021b92f0170033fe5498a52d29182d28d..c90ed365f929365bdfd0e482de1f950a8750cf28 100644 (file)
@@ -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)
 
index bd458273439af6c868c01823ae12d456fe7ae7ba..1900e9a4b6aad7565b8cf37252c01f929767103e 100644 (file)
@@ -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
 
index 0a703e7cd9328b89dc027115538212ae543c6b93..975d3ade64f1f746a8c9fc976b42771f4d14d2ea 100644 (file)
@@ -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:
index dac72cf0165f5fabfb2f81fb3537a35689de2354..9399029036a2f3f49946b899a547641d58a10e32 100644 (file)
@@ -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)
index 91c80022465e8637e266a364084e01e826366468..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
@@ -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
index df8d8873d726a3cab8922aef7617b57c918fe3e6..ae2e875e650e85a8206edea4071fb2d55295a679 100644 (file)
@@ -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
index ddc9af47e8388aab0b2819eae8bf569e9e4564ef..969d345b943415792cb8fa7b11c54b3581f75ee9 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -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()
 
diff --git a/skin.py b/skin.py
index cb433269a584459d0c8d1a5ad719ca32211bd9ef..07213915e404de20767e225993fc0a07364c25e3 100644 (file)
--- a/skin.py
+++ b/skin.py
@@ -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
index 11c5b233a5a9e9d50ff3001e94050351d1d7cf65..bf232628ed07496df54e182a373ea90694485736 100644 (file)
@@ -359,7 +359,5 @@ def init_all():
        import Components.RFmod
        Components.RFmod.InitRFmod()
 
-       import Components.NimManager
-
        import Screens.Ci
        Screens.Ci.InitCiConfig()
index 0ad53af9d79addeb55d05f7454256fc7070d0af2..d4ac23d7b5363b87ab5ed8d0e1919cebb82d1031 100644 (file)
--- a/timer.py
+++ b/timer.py
@@ -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: