fix some imports

diff --git a/lib/python/Components/ChoiceList.py b/lib/python/Components/ChoiceList.py
index 1677874988c820d91f5499f463c6193ffcfe99e7..fe505c2a56e6f84177976f462c851400faf4b902 100644 (file)
--- a/lib/python/Components/ChoiceList.py
+++ b/lib/python/Components/ChoiceList.py
@@ -1,6 +1,6 @@
 from MenuList import MenuList
 from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename
 from MenuList import MenuList
 from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename

-from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, eListbox, gFont
+from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, gFont

 from Tools.LoadPixmap import LoadPixmap
 
 def ChoiceEntryComponent(key, text):
 from Tools.LoadPixmap import LoadPixmap
 
 def ChoiceEntryComponent(key, text):

diff --git a/lib/python/Components/Converter/Streaming.py b/lib/python/Components/Converter/Streaming.py
index f12ebd99243e8fbc3d49f321769be7250c471e53..2746ee847aa7c5cf8b89c16f778b46c826e3435a 100644 (file)
--- a/lib/python/Components/Converter/Streaming.py
+++ b/lib/python/Components/Converter/Streaming.py
@@ -23,7 +23,6 @@ class Streaming(Converter):
 
                if s is None:
                        err = service.getError()
 
                if s is None:
                        err = service.getError()

-                       from enigma import iRecordableService

                        if err:
                                return "-SERVICE ERROR:%d\n" % err
                        else:
                        if err:
                                return "-SERVICE ERROR:%d\n" % err
                        else:

diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py
index 54106fba2e7fb98f709326eaa70f24e43c46f84d..889df6294ce0dcd6b79bb2c0eb6ffa753b9864d2 100644 (file)
--- a/lib/python/Components/FileList.py
+++ b/lib/python/Components/FileList.py
@@ -1,12 +1,11 @@
-import re
-
+from re import compile as re_compile

 from os import path as os_path, listdir
 from MenuList import MenuList
 from Components.Harddisk import harddiskmanager
 
 from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename
 
 from os import path as os_path, listdir
 from MenuList import MenuList
 from Components.Harddisk import harddiskmanager
 
 from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename
 

-from enigma import RT_HALIGN_LEFT, eListbox, eListboxPythonMultiContent, \
+from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, \

        eServiceReference, eServiceCenter, gFont
 from Tools.LoadPixmap import LoadPixmap
 
        eServiceReference, eServiceCenter, gFont
 from Tools.LoadPixmap import LoadPixmap
 


@@ -184,7 +183,7 @@ class FileList(MenuList):
                                        path = directory + x
                                        name = x
 
                                        path = directory + x
                                        name = x
 

-                               if (self.matchingPattern is None) or re.compile(self.matchingPattern).search(path):
+                               if (self.matchingPattern is None) or re_compile(self.matchingPattern).search(path):

                                        self.list.append(FileEntryComponent(name = name, absolute = x , isDir = False))
 
                self.l.setList(self.list)
                                        self.list.append(FileEntryComponent(name = name, absolute = x , isDir = False))
 
                self.l.setList(self.list)

diff --git a/lib/python/Components/MediaPlayer.py b/lib/python/Components/MediaPlayer.py
index ef8d3a41f2db479911acd23047fe493c02cb8441..84f7bec7b9ddd7db68f07d6d6664564c3787daa5 100644 (file)
--- a/lib/python/Components/MediaPlayer.py
+++ b/lib/python/Components/MediaPlayer.py
@@ -3,7 +3,7 @@ from MenuList import MenuList
 from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename
 from os import path
 
 from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename
 from os import path
 

-from enigma import eListboxPythonMultiContent, eListbox, RT_VALIGN_CENTER, gFont, eServiceCenter
+from enigma import eListboxPythonMultiContent, RT_VALIGN_CENTER, gFont, eServiceCenter

 
 from Tools.LoadPixmap import LoadPixmap
 
 
 from Tools.LoadPixmap import LoadPixmap
 

diff --git a/lib/python/Components/ParentalControlList.py b/lib/python/Components/ParentalControlList.py
index 31483865c479f611696fb37b21b88757c67d0356..71912620437a695ec9bf5a87ab127e3c84b402ec 100644 (file)
--- a/lib/python/Components/ParentalControlList.py
+++ b/lib/python/Components/ParentalControlList.py
@@ -2,7 +2,7 @@ from MenuList import MenuList
 from Components.ParentalControl import parentalControl
 from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename
 
 from Components.ParentalControl import parentalControl
 from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename
 

-from enigma import eListbox, eListboxPythonMultiContent, gFont, RT_HALIGN_LEFT
+from enigma import eListboxPythonMultiContent, gFont, RT_HALIGN_LEFT

 from Tools.LoadPixmap import LoadPixmap
 
 lockPicture = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/lock.png"))
 from Tools.LoadPixmap import LoadPixmap
 
 lockPicture = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/lock.png"))

diff --git a/lib/python/Components/PluginList.py b/lib/python/Components/PluginList.py
index 6d6f2d0055ad781e06f2a9c6a8afef6dd64161e6..63136ccee20a3c78b6b7b4509186d3e2531f0b1b 100644 (file)
--- a/lib/python/Components/PluginList.py
+++ b/lib/python/Components/PluginList.py
@@ -3,7 +3,7 @@ from MenuList import MenuList
 from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE
 from Components.MultiContent import MultiContentEntryText, MultiContentEntryPixmapAlphaTest
 
 from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE
 from Components.MultiContent import MultiContentEntryText, MultiContentEntryPixmapAlphaTest
 

-from enigma import eListboxPythonMultiContent, eListbox, gFont
+from enigma import eListboxPythonMultiContent, gFont

 from Tools.LoadPixmap import LoadPixmap
 
 def PluginEntryComponent(plugin):
 from Tools.LoadPixmap import LoadPixmap
 
 def PluginEntryComponent(plugin):

diff --git a/lib/python/Components/UsageConfig.py b/lib/python/Components/UsageConfig.py
index cfdb4589a3e52f9d69143b5290a6d9c2bb3b7084..269d5a2c61ab6e080207ae4f66ccf93e057bcc3b 100644 (file)
--- a/lib/python/Components/UsageConfig.py
+++ b/lib/python/Components/UsageConfig.py
@@ -1,4 +1,4 @@
-from config import ConfigSubsection, ConfigYesNo, config, ConfigSelection, ConfigText, ConfigNumber, ConfigSet, ConfigNothing
+from config import ConfigSubsection, ConfigYesNo, config, ConfigSelection, ConfigText, ConfigNumber, ConfigSet

 from enigma import Misc_Options, setTunerTypePriorityOrder;
 from SystemInfo import SystemInfo
 import os
 from enigma import Misc_Options, setTunerTypePriorityOrder;
 from SystemInfo import SystemInfo
 import os

diff --git a/lib/python/Plugins/Extensions/DVDBurn/TitleList.py b/lib/python/Plugins/Extensions/DVDBurn/TitleList.py
index efbab91a5d8247f76df08f7cd0e4c969af6a555a..99344e46164e9b78da4f3f218c9420226bf90820 100644 (file)
--- a/lib/python/Plugins/Extensions/DVDBurn/TitleList.py
+++ b/lib/python/Plugins/Extensions/DVDBurn/TitleList.py
@@ -1,4 +1,4 @@
-import DVDProject, DVDTitle, TitleList, TitleCutter
+import DVDProject, TitleList, TitleCutter

 
 from Screens.Screen import Screen
 from Components.ActionMap import HelpableActionMap, ActionMap
 
 from Screens.Screen import Screen
 from Components.ActionMap import HelpableActionMap, ActionMap

diff --git a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
index 0db850a457cac6392c13b3e8a6f077b4b52d3292..8e9031d729fd2f905b3dc79ecc23fe96f270cb45 100644 (file)
--- a/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/DVDPlayer/plugin.py
@@ -1,10 +1,8 @@
 from os import path as os_path, remove as os_remove, listdir as os_listdir, system
 from os import path as os_path, remove as os_remove, listdir as os_listdir, system

-from time import strftime
-from enigma import eTimer, iPlayableService, eServiceCenter, iServiceInformation, eServiceReference, iServiceKeys
+from enigma import eTimer, iPlayableService, iServiceInformation, eServiceReference, iServiceKeys

 from Screens.Screen import Screen
 from Screens.MessageBox import MessageBox
 from Screens.ChoiceBox import ChoiceBox
 from Screens.Screen import Screen
 from Screens.MessageBox import MessageBox
 from Screens.ChoiceBox import ChoiceBox

-from Screens.InputBox import InputBox

 from Screens.HelpMenu import HelpableScreen
 from Screens.InfoBarGenerics import InfoBarSeek, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarShowHide, InfoBarNotifications
 from Components.ActionMap import ActionMap, NumberActionMap, HelpableActionMap
 from Screens.HelpMenu import HelpableScreen
 from Screens.InfoBarGenerics import InfoBarSeek, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarShowHide, InfoBarNotifications
 from Components.ActionMap import ActionMap, NumberActionMap, HelpableActionMap


@@ -12,11 +10,8 @@ from Components.Label import Label
 from Components.FileList import FileList
 from Components.ServiceEventTracker import ServiceEventTracker, InfoBarBase
 from Components.config import config
 from Components.FileList import FileList
 from Components.ServiceEventTracker import ServiceEventTracker, InfoBarBase
 from Components.config import config

-from Components.ProgressBar import ProgressBar
-from ServiceReference import ServiceReference

 from Tools.Directories import pathExists, fileExists
 
 from Tools.Directories import pathExists, fileExists
 

-import random

 import servicedvd # load c++ part of dvd player plugin
 
 lastpath = ""
 import servicedvd # load c++ part of dvd player plugin
 
 lastpath = ""

diff --git a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
index bca85518689eeaedd3c3a7ec231b67ef7843c8d9..267ada1cbbf3d16408d41d1585197a0015570a0e 100644 (file)
--- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
@@ -1,6 +1,6 @@
 from os import path as os_path, remove as os_remove, listdir as os_listdir
 from time import strftime
 from os import path as os_path, remove as os_remove, listdir as os_listdir
 from time import strftime

-from enigma import eTimer, iPlayableService, eServiceCenter, iServiceInformation
+from enigma import eTimer, eServiceCenter, iServiceInformation

 from Screens.Screen import Screen
 from Screens.MessageBox import MessageBox
 from Screens.InputBox import InputBox
 from Screens.Screen import Screen
 from Screens.MessageBox import MessageBox
 from Screens.InputBox import InputBox


@@ -12,7 +12,7 @@ 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.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, InfoBarBase
+from Components.ServiceEventTracker import InfoBarBase

 from Components.Playlist import PlaylistIOInternal, PlaylistIOM3U, PlaylistIOPLS
 from Screens.InfoBarGenerics import InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSupport, InfoBarNotifications
 from ServiceReference import ServiceReference
 from Components.Playlist import PlaylistIOInternal, PlaylistIOM3U, PlaylistIOPLS
 from Screens.InfoBarGenerics import InfoBarSeek, InfoBarAudioSelection, InfoBarCueSheetSupport, InfoBarNotifications
 from ServiceReference import ServiceReference

diff --git a/lib/python/Plugins/SystemPlugins/VideoTune/VideoFinetune.py b/lib/python/Plugins/SystemPlugins/VideoTune/VideoFinetune.py
index 11e14d36926c1bcd5aa4fc19880b91edb48b8651..d27e84f953cd141f6c8eb49c78e85cc863e25cfa 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/VideoTune/VideoFinetune.py
+++ b/lib/python/Plugins/SystemPlugins/VideoTune/VideoFinetune.py
@@ -2,7 +2,7 @@ from Screens.Screen import Screen
 from Components.Sources.CanvasSource import CanvasSource
 from Components.ActionMap import ActionMap
 from enigma import gFont
 from Components.Sources.CanvasSource import CanvasSource
 from Components.ActionMap import ActionMap
 from enigma import gFont

-from enigma import RT_HALIGN_LEFT, RT_HALIGN_RIGHT, RT_VALIGN_CENTER, RT_WRAP
+from enigma import RT_HALIGN_RIGHT, RT_WRAP

 
 def RGB(r,g,b):
        return (r<<16)|(g<<8)|b
 
 def RGB(r,g,b):
        return (r<<16)|(g<<8)|b

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
index a10d93941d3e3e17112e58622ec6ba92158be2a8..dee1b0d2e6a8dd4b27e30c2b78d33c040ac26ef9 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
@@ -1,15 +1,5 @@
-from Screens.Screen import Screen
-from Plugins.Plugin import PluginDescriptor
-

 from enigma import eTimer
 from enigma import eTimer

-
-from Components.ActionMap import ActionMap
-from Components.Label import Label
-from Components.Pixmap import Pixmap
-from Screens.MessageBox import MessageBox
-from Screens.Setup import SetupSummary
-from Components.ConfigList import ConfigListScreen
-from Components.config import getConfigListEntry, config, ConfigSelection, ConfigSubDict, ConfigYesNo
+from Components.config import config, ConfigSelection, ConfigSubDict, ConfigYesNo

 
 from Tools.CList import CList
 
 
 from Tools.CList import CList
 

diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
index ae337ef1b114dc3ea9e049704d883bd8113402d1..5eef8cda1a425b91e470dc513a5817df28e9273c 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
+++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
@@ -1,14 +1,11 @@
-from Screens.Wizard import wizardManager, WizardSummary
+from Screens.Wizard import WizardSummary

 from Screens.WizardLanguage import WizardLanguage
 from Screens.WizardLanguage import WizardLanguage

-import sys

 from VideoHardware import video_hw
 
 from Components.Pixmap import Pixmap, MovingPixmap
 from Components.config import config, ConfigBoolean, configfile
 
 from VideoHardware import video_hw
 
 from Components.Pixmap import Pixmap, MovingPixmap
 from Components.config import config, ConfigBoolean, configfile
 

-from Tools.Directories import resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
-from enigma import eListboxPythonMultiContent, gFont, RT_HALIGN_LEFT
-from Tools.LoadPixmap import LoadPixmap
+from Tools.Directories import resolveFilename, SCOPE_PLUGINS

 
 config.misc.showtestcard = ConfigBoolean(default = False)
 
 
 config.misc.showtestcard = ConfigBoolean(default = False)
 

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 2fd3bd8b28e9a7e138cdf04240919a6e7482199d..b203b24e7577c90e041bf49d46d39258d0c599c4 100644 (file)
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -21,7 +21,6 @@ profile("ChannelSelection.py 2.3")
 from Components.Input import Input
 profile("ChannelSelection.py 3")
 from Components.ParentalControl import parentalControl
 from Components.Input import Input
 profile("ChannelSelection.py 3")
 from Components.ParentalControl import parentalControl

-from Components.Pixmap import Pixmap

 from Screens.InputBox import InputBox, PinInput
 from Screens.MessageBox import MessageBox
 from Screens.ServiceInfo import ServiceInfo
 from Screens.InputBox import InputBox, PinInput
 from Screens.MessageBox import MessageBox
 from Screens.ServiceInfo import ServiceInfo

diff --git a/lib/python/Screens/DefaultWizard.py b/lib/python/Screens/DefaultWizard.py
index 79c68f65aa45db02bee42ef1fe4d0a806f454731..ec45a28f80e87b52c57697bfe914f082e02882f6 100644 (file)
--- a/lib/python/Screens/DefaultWizard.py
+++ b/lib/python/Screens/DefaultWizard.py
@@ -1,18 +1,16 @@
 from Wizard import wizardManager
 from Screens.WizardLanguage import WizardLanguage
 from Wizard import wizardManager
 from Screens.WizardLanguage import WizardLanguage

-from Tools.Directories import crawlDirectory, resolveFilename, SCOPE_DEFAULTDIR, SCOPE_DEFAULTPARTITIONMOUNTDIR, SCOPE_DEFAULTPARTITION
+from Tools.Directories import resolveFilename, SCOPE_DEFAULTDIR, SCOPE_DEFAULTPARTITIONMOUNTDIR, SCOPE_DEFAULTPARTITION

 
 from Components.Pixmap import Pixmap, MovingPixmap
 from Components.config import config, ConfigBoolean, configfile, ConfigYesNo, getConfigListEntry
 
 from Components.Pixmap import Pixmap, MovingPixmap
 from Components.config import config, ConfigBoolean, configfile, ConfigYesNo, getConfigListEntry

-from Components.DreamInfoHandler import DreamInfoHandler, InfoHandler, InfoHandlerParseError
+from Components.DreamInfoHandler import DreamInfoHandler

 from Components.PluginComponent import plugins
 from Plugins.Plugin import PluginDescriptor
 from Components.PluginComponent import plugins
 from Plugins.Plugin import PluginDescriptor

-import os
+from os import system as os_system, path as os_path

 
 config.misc.defaultchosen = ConfigBoolean(default = True)
 
 
 config.misc.defaultchosen = ConfigBoolean(default = True)
 

-import xml.sax
-

 class DefaultWizard(WizardLanguage, DreamInfoHandler):
        def __init__(self, session, silent = True, showSteps = False, neededTag = None):
                DreamInfoHandler.__init__(self, self.statusCallback, neededTag = neededTag)
 class DefaultWizard(WizardLanguage, DreamInfoHandler):
        def __init__(self, session, silent = True, showSteps = False, neededTag = None):
                DreamInfoHandler.__init__(self, self.statusCallback, neededTag = neededTag)


@@ -27,7 +25,7 @@ class DefaultWizard(WizardLanguage, DreamInfoHandler):
                self["arrowup2"] = MovingPixmap()
        
        def setDirectory(self):
                self["arrowup2"] = MovingPixmap()
        
        def setDirectory(self):

-               os.system("mount %s %s" % (resolveFilename(SCOPE_DEFAULTPARTITION), resolveFilename(SCOPE_DEFAULTPARTITIONMOUNTDIR)))
+               os_system("mount %s %s" % (resolveFilename(SCOPE_DEFAULTPARTITION), resolveFilename(SCOPE_DEFAULTPARTITIONMOUNTDIR)))

                self.directory = resolveFilename(SCOPE_DEFAULTPARTITIONMOUNTDIR)
                self.xmlfile = "defaultwizard.xml"
         
                self.directory = resolveFilename(SCOPE_DEFAULTPARTITIONMOUNTDIR)
                self.xmlfile = "defaultwizard.xml"
         


@@ -64,8 +62,8 @@ class DefaultWizard(WizardLanguage, DreamInfoHandler):
                
 class DreamPackageWizard(DefaultWizard):
        def __init__(self, session, packagefile, silent = False):
                
 class DreamPackageWizard(DefaultWizard):
        def __init__(self, session, packagefile, silent = False):

-               os.system("mkdir /tmp/package")
-               os.system("tar xpzf %s -C /tmp/package" % packagefile)
+               os_system("mkdir /tmp/package")
+               os_system("tar xpzf %s -C /tmp/package" % packagefile)

                self.packagefile = packagefile
                DefaultWizard.__init__(self, session, silent)
                
                self.packagefile = packagefile
                DefaultWizard.__init__(self, session, silent)
                


@@ -85,13 +83,13 @@ class ImageDefaultInstaller(DreamInfoHandler):
 
 def install(choice):
        if choice is not None:
 
 def install(choice):
        if choice is not None:

-               #os.system("mkdir /tmp/package && tar xpzf %s ")
+               #os_system("mkdir /tmp/package && tar xpzf %s ")

                choice[2].open(DreamPackageWizard, choice[1])
 
 def filescan_open(list, session, **kwargs):
        from Screens.ChoiceBox import ChoiceBox
        print "open default wizard"
                choice[2].open(DreamPackageWizard, choice[1])
 
 def filescan_open(list, session, **kwargs):
        from Screens.ChoiceBox import ChoiceBox
        print "open default wizard"

-       filelist = [(os.path.split(x.path)[1], x.path, session) for x in list]
+       filelist = [(os_path.split(x.path)[1], x.path, session) for x in list]

        print filelist
        session.openWithCallback(install, ChoiceBox, title = _("Please choose he package..."), list=filelist)
 
        print filelist
        session.openWithCallback(install, ChoiceBox, title = _("Please choose he package..."), list=filelist)
 

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 05c5c98a91d0b27b17653d2c8d976a14843163ab..41df247522ff75b02128d83f41a06b8dd3248849 100644 (file)
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -1,4 +1,4 @@
-from Tools.Profile import profile, profile_final
+from Tools.Profile import profile

 
 from Screen import Screen
 
 
 from Screen import Screen
 

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 3a735dec074090304ff738636e012392800351dc..81a776f9c5c564dbe8509d2e4d8aa1e291523a1d 100644 (file)
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -2,11 +2,9 @@ from ChannelSelection import ChannelSelection, BouquetSelector
 
 from Components.ActionMap import ActionMap, HelpableActionMap
 from Components.ActionMap import NumberActionMap
 
 from Components.ActionMap import ActionMap, HelpableActionMap
 from Components.ActionMap import NumberActionMap

-from Components.BlinkingPixmap import BlinkingPixmapConditional

 from Components.Harddisk import harddiskmanager
 from Components.Input import Input
 from Components.Label import Label
 from Components.Harddisk import harddiskmanager
 from Components.Input import Input
 from Components.Label import Label

-from Components.Pixmap import Pixmap

 from Components.PluginComponent import plugins
 from Components.ServiceEventTracker import ServiceEventTracker
 from Components.Sources.Boolean import Boolean
 from Components.PluginComponent import plugins
 from Components.ServiceEventTracker import ServiceEventTracker
 from Components.Sources.Boolean import Boolean


@@ -34,7 +32,7 @@ from Tools import Notifications
 from Tools.Directories import SCOPE_HDD, resolveFilename, pathExists
 
 from enigma import eTimer, eServiceCenter, eDVBServicePMTHandler, iServiceInformation, \
 from Tools.Directories import SCOPE_HDD, resolveFilename, pathExists
 
 from enigma import eTimer, eServiceCenter, eDVBServicePMTHandler, iServiceInformation, \

-       iPlayableService, eServiceReference, eDVBResourceManager, iFrontendInformation, eEPGCache
+       iPlayableService, eServiceReference, eEPGCache

 
 from time import time, localtime, strftime
 from os import stat as os_stat
 
 from time import time, localtime, strftime
 from os import stat as os_stat

diff --git a/lib/python/Screens/LocationBox.py b/lib/python/Screens/LocationBox.py
index 6d360339540c7c181421dcfee202ed634af1f2cc..e41601a94147e5b23e04bfe7e14c533ea37e4f65 100644 (file)
--- a/lib/python/Screens/LocationBox.py
+++ b/lib/python/Screens/LocationBox.py
@@ -12,8 +12,7 @@ from Screens.ChoiceBox import ChoiceBox
 # Generic
 from Tools.BoundFunction import boundFunction
 from Tools.Directories import *
 # Generic
 from Tools.BoundFunction import boundFunction
 from Tools.Directories import *

-from Components.config import config, configfile, ConfigSubList, ConfigSubsection, \
-               ConfigText, ConfigNumber, ConfigBoolean
+from Components.config import config

 import os
 
 # Quickselect
 import os
 
 # Quickselect

diff --git a/lib/python/Screens/Satconfig.py b/lib/python/Screens/Satconfig.py
index 3aabc0e1934566af665999c99580a144d053b07f..40bf70463ec66e1bfce1ea5d5df3f29e3141ecf5 100644 (file)
--- a/lib/python/Screens/Satconfig.py
+++ b/lib/python/Screens/Satconfig.py
@@ -4,7 +4,7 @@ from Components.SystemInfo import SystemInfo
 from Components.ActionMap import ActionMap
 from Components.ConfigList import ConfigListScreen
 from Components.MenuList import MenuList
 from Components.ActionMap import ActionMap
 from Components.ConfigList import ConfigListScreen
 from Components.MenuList import MenuList

-from Components.NimManager import nimmanager, InitNimManager
+from Components.NimManager import nimmanager

 from Components.config import getConfigListEntry, config, ConfigNothing, ConfigSelection, updateConfigElement
 from Screens.MessageBox import MessageBox
 
 from Components.config import getConfigListEntry, config, ConfigNothing, ConfigSelection, updateConfigElement
 from Screens.MessageBox import MessageBox
 

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index 287847baf93247c1ec01a8e355c47afb993d01e3..2ba7342fb83480d193303027e221f8201a47fae6 100644 (file)
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -1,4 +1,4 @@
-from Tools.Profile import profile, profile_final
+from Tools.Profile import profile

 
 profile("LOAD:GUISkin")
 from Components.GUISkin import GUISkin
 
 profile("LOAD:GUISkin")
 from Components.GUISkin import GUISkin

diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py
index f352e8cb0e026aaf227b6e665602cb1a8e37c9e6..3ff0b76e3ed0f9d6f0361765aba8572ffefddca2 100644 (file)
--- a/lib/python/Screens/Setup.py
+++ b/lib/python/Screens/Setup.py
@@ -7,8 +7,6 @@ from Components.Label import Label
 from Components.Pixmap import Pixmap
 
 import xml.dom.minidom
 from Components.Pixmap import Pixmap
 
 import xml.dom.minidom

-from skin import elementsWithTag
-

 from Tools import XMLTools
 
 # FIXME: use resolveFile!
 from Tools import XMLTools
 
 # FIXME: use resolveFile!


@@ -151,7 +149,7 @@ class Setup(ConfigListScreen, Screen):
 
 def getSetupTitle(id):
        xmldata = setupdom.childNodes[0].childNodes
 
 def getSetupTitle(id):
        xmldata = setupdom.childNodes[0].childNodes

-       for x in elementsWithTag(xmldata, "setup"):
+       for x in XMLTools.elementsWithTag(xmldata, "setup"):

                if x.getAttribute("key") == id:
                        return x.getAttribute("title").encode("UTF-8")
        raise "unknown setup id '%s'!" % repr(id)
                if x.getAttribute("key") == id:
                        return x.getAttribute("title").encode("UTF-8")
        raise "unknown setup id '%s'!" % repr(id)

diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index ca1a39295e9a5f9e3afe4d2c9d2322d9fb9e6642..31a65a3032f6a5c0536494f21cb455a37b49db8c 100644 (file)
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -8,15 +8,13 @@ from Components.MenuList import MenuList
 from Components.Button import Button
 from Components.Label import Label
 from Components.Pixmap import Pixmap
 from Components.Button import Button
 from Components.Label import Label
 from Components.Pixmap import Pixmap

-from Components.SelectionList import SelectionList, SelectionEntryComponent
-from Components.MovieList import MovieList

 from Screens.LocationBox import MovieLocationBox
 from Screens.ChoiceBox import ChoiceBox
 from RecordTimer import AFTEREVENT
 from Tools.Directories import resolveFilename, SCOPE_HDD
 from Screens.LocationBox import MovieLocationBox
 from Screens.ChoiceBox import ChoiceBox
 from RecordTimer import AFTEREVENT
 from Tools.Directories import resolveFilename, SCOPE_HDD

-from enigma import eEPGCache, eServiceReference
-import time
-import datetime
+from enigma import eEPGCache
+from time import localtime, mktime, time, strftime
+from datetime import datetime

 
 class TimerEntry(Screen, ConfigListScreen):
        def __init__(self, session, timer):
 
 class TimerEntry(Screen, ConfigListScreen):
        def __init__(self, session, timer):


@@ -82,7 +80,7 @@ class TimerEntry(Screen, ConfigListScreen):
                        else: # once
                                type = "once"
                                repeated = None
                        else: # once
                                type = "once"
                                repeated = None

-                               weekday = (int(time.strftime("%w", time.localtime(self.timer.begin))) - 1) % 7
+                               weekday = (int(strftime("%w", localtime(self.timer.begin))) - 1) % 7

                                day[weekday] = 1
 
                        self.timerentry_justplay = ConfigSelection(choices = [("zap", _("zap")), ("record", _("record"))], default = {0: "record", 1: "zap"}[justplay])
                                day[weekday] = 1
 
                        self.timerentry_justplay = ConfigSelection(choices = [("zap", _("zap")), ("record", _("record"))], default = {0: "record", 1: "zap"}[justplay])


@@ -247,14 +245,14 @@ class TimerEntry(Screen, ConfigListScreen):
                        self["config"].invalidate(self.channelEntry)
 
        def getTimestamp(self, date, mytime):
                        self["config"].invalidate(self.channelEntry)
 
        def getTimestamp(self, date, mytime):

-               d = time.localtime(date)
-               dt = datetime.datetime(d.tm_year, d.tm_mon, d.tm_mday, mytime[0], mytime[1])
-               return int(time.mktime(dt.timetuple()))
+               d = localtime(date)
+               dt = datetime(d.tm_year, d.tm_mon, d.tm_mday, mytime[0], mytime[1])
+               return int(mktime(dt.timetuple()))

 
        def buildRepeatedBegin(self, rep_time, start_time):
 
        def buildRepeatedBegin(self, rep_time, start_time):

-               d = time.localtime(rep_time)
-               dt = datetime.datetime(d.tm_year, d.tm_mon, d.tm_mday, start_time[0], start_time[1])
-               return int(time.mktime(dt.timetuple()))
+               d = localtime(rep_time)
+               dt = datetime(d.tm_year, d.tm_mon, d.tm_mday, start_time[0], start_time[1])
+               return int(mktime(dt.timetuple()))

 
        def getBeginEnd(self):
                enddate = self.timerentry_enddate.value
 
        def getBeginEnd(self):
                enddate = self.timerentry_enddate.value


@@ -305,8 +303,8 @@ class TimerEntry(Screen, ConfigListScreen):
                                                self.timer.setRepeated(x)
 
                        self.timer.repeatedbegindate = self.buildRepeatedBegin(self.timerentry_repeatedbegindate.value, self.timerentry_starttime.value)
                                                self.timer.setRepeated(x)
 
                        self.timer.repeatedbegindate = self.buildRepeatedBegin(self.timerentry_repeatedbegindate.value, self.timerentry_starttime.value)

-                       self.timer.begin = self.getTimestamp(time.time(), self.timerentry_starttime.value)
-                       self.timer.end = self.getTimestamp(time.time(), self.timerentry_endtime.value)
+                       self.timer.begin = self.getTimestamp(time(), self.timerentry_starttime.value)
+                       self.timer.end = self.getTimestamp(time(), self.timerentry_endtime.value)

 
                        # when a timer end is set before the start, add 1 day
                        if self.timer.end < self.timer.begin:
 
                        # when a timer end is set before the start, add 1 day
                        if self.timer.end < self.timer.begin:


@@ -392,7 +390,7 @@ class TimerLog(Screen):
        def fillLogList(self):
                self.list = [ ]
                for x in self.log_entries:
        def fillLogList(self):
                self.list = [ ]
                for x in self.log_entries:

-                       self.list.append((str(time.strftime("%Y-%m-%d %H-%M", time.localtime(x[0])) + " - " + x[2]), x))
+                       self.list.append((str(strftime("%Y-%m-%d %H-%M", localtime(x[0])) + " - " + x[2]), x))

 
        def clearLog(self):
                self.log_entries = []
 
        def clearLog(self):
                self.log_entries = []

diff --git a/mytest.py b/mytest.py
index d58649cfafe45126ccf7a0f918803706058ace58..8c900c18f5e59dcbde70125ea5909229ac4e9829 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -36,11 +36,11 @@ profile("LOAD:Navigation")
 from Navigation import Navigation
 
 profile("LOAD:skin")
 from Navigation import Navigation
 
 profile("LOAD:skin")

-from skin import readSkin, applyAllAttributes
+from skin import readSkin

 
 profile("LOAD:Tools")
 from Tools.Directories import InitFallbackFiles, resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE
 
 profile("LOAD:Tools")
 from Tools.Directories import InitFallbackFiles, resolveFilename, SCOPE_PLUGINS, SCOPE_SKIN_IMAGE

-from Components.config import config, configfile, ConfigText, ConfigSubsection, ConfigInteger
+from Components.config import config, configfile, ConfigText

 InitFallbackFiles()
 
 profile("ReloadProfiles")
 InitFallbackFiles()
 
 profile("ReloadProfiles")

diff --git a/skin.py b/skin.py
index a7824f918b011a358fcd727490ad22a9344d59ab..97954715c4d94f6a1f765cfb4ec708f8aa88f8d0 100644 (file)
--- a/skin.py
+++ b/skin.py
@@ -1,4 +1,4 @@
-from Tools.Profile import profile, profile_final
+from Tools.Profile import profile

 profile("LOAD:ElementTree")
 import xml.etree.cElementTree
 from os import path
 profile("LOAD:ElementTree")
 import xml.etree.cElementTree
 from os import path


@@ -14,7 +14,7 @@ from Tools.Directories import resolveFilename, SCOPE_SKIN, SCOPE_SKIN_IMAGE, SCO
 from Tools.Import import my_import
 from Tools.LoadPixmap import LoadPixmap
 
 from Tools.Import import my_import
 from Tools.LoadPixmap import LoadPixmap
 

-from Tools.XMLTools import elementsWithTag, mergeText
+from Tools.XMLTools import mergeText

 
 colorNames = dict()
 
 
 colorNames = dict()