cleanup some imports

[vuplus_dvbapp] / lib / python / Components / EpgList.py

diff --git a/lib/python/Components/EpgList.py b/lib/python/Components/EpgList.py
index 4444d3b..23d7784 100644 (file)
--- a/lib/python/Components/EpgList.py
+++ b/lib/python/Components/EpgList.py
@@ -1,10 +1,9 @@
-from HTMLComponent import *
-from GUIComponent import *
+from HTMLComponent import HTMLComponent
+from GUIComponent import GUIComponent
 
 from enigma import eEPGCache, eListbox, eListboxPythonMultiContent, gFont, loadPNG, \
        RT_HALIGN_LEFT, RT_HALIGN_RIGHT, RT_HALIGN_CENTER, RT_VALIGN_CENTER
 
-from re import *
 from time import localtime, time
 from ServiceReference import ServiceReference
 from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE
@@ -197,7 +196,8 @@ class EPGList(HTMLComponent, GUIComponent):
 
        def fillMultiEPG(self, services, stime=-1):
                t = time()
-               test = [ '0RIBDTCn', (service.ref.toString(), 0, stime) for service in services ]
+               test = [ (service.ref.toString(), 0, stime) for service in services ]
+               test.insert(0, '0RIBDTCn')
                self.list = self.queryEPG(test)
                self.l.setList(self.list)
                print time() - t
@@ -205,7 +205,8 @@ class EPGList(HTMLComponent, GUIComponent):
 
        def updateMultiEPG(self, direction):
                t = time()
-               test = [ 'RIBDTCn', x[3] and (x[1], x[4], x[3]) or (x[1], x[4], 0) for x in self.list ]
+               test = [ x[3] and (x[1], direction, x[3]) or (x[1], direction, 0) for x in self.list ]
+               test.insert(0, 'RIBDTCn')
                tmp = self.queryEPG(test)
                cnt=0
                for x in tmp: