diff options
Diffstat (limited to 'lib/python/Components')
| -rw-r--r-- | lib/python/Components/ChoiceList.py | 2 | ||||
| -rw-r--r-- | lib/python/Components/Converter/Streaming.py | 1 | ||||
| -rw-r--r-- | lib/python/Components/FileList.py | 7 | ||||
| -rw-r--r-- | lib/python/Components/MediaPlayer.py | 2 | ||||
| -rw-r--r-- | lib/python/Components/ParentalControlList.py | 2 | ||||
| -rw-r--r-- | lib/python/Components/PluginList.py | 2 | ||||
| -rw-r--r-- | lib/python/Components/UsageConfig.py | 2 |
7 files changed, 8 insertions, 10 deletions
diff --git a/lib/python/Components/ChoiceList.py b/lib/python/Components/ChoiceList.py index 16778749..fe505c2a 100644 --- 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 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): diff --git a/lib/python/Components/Converter/Streaming.py b/lib/python/Components/Converter/Streaming.py index f12ebd99..2746ee84 100644 --- 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() - from enigma import iRecordableService if err: return "-SERVICE ERROR:%d\n" % err else: diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py index 54106fba..889df629 100644 --- 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 enigma import RT_HALIGN_LEFT, eListbox, eListboxPythonMultiContent, \ +from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, \ eServiceReference, eServiceCenter, gFont from Tools.LoadPixmap import LoadPixmap @@ -184,7 +183,7 @@ class FileList(MenuList): 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) diff --git a/lib/python/Components/MediaPlayer.py b/lib/python/Components/MediaPlayer.py index ef8d3a41..84f7bec7 100644 --- 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 enigma import eListboxPythonMultiContent, eListbox, RT_VALIGN_CENTER, gFont, eServiceCenter +from enigma import eListboxPythonMultiContent, RT_VALIGN_CENTER, gFont, eServiceCenter from Tools.LoadPixmap import LoadPixmap diff --git a/lib/python/Components/ParentalControlList.py b/lib/python/Components/ParentalControlList.py index 31483865..71912620 100644 --- 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 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")) diff --git a/lib/python/Components/PluginList.py b/lib/python/Components/PluginList.py index 6d6f2d00..63136cce 100644 --- 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 enigma import eListboxPythonMultiContent, eListbox, gFont +from enigma import eListboxPythonMultiContent, gFont from Tools.LoadPixmap import LoadPixmap def PluginEntryComponent(plugin): diff --git a/lib/python/Components/UsageConfig.py b/lib/python/Components/UsageConfig.py index cfdb4589..269d5a2c 100644 --- 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 |