Merge branch 'vuplus_experimental' of /opt/repository/enigma2 into vuplus_experimental

diff --git a/lib/python/Plugins/SystemPlugins/FactoryTest/plugin.py b/lib/python/Plugins/SystemPlugins/FactoryTest/plugin.py
index 347573c..462b328 100755 (executable)
--- a/lib/python/Plugins/SystemPlugins/FactoryTest/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/FactoryTest/plugin.py
@@ -23,20 +23,7 @@ from Components.NimManager import nimmanager
 from enigma import eDVBCI_UI,eDVBCIInterfaces
 from Tools.Directories import resolveFilename, SCOPE_SYSETC
 
-class TestResultList(HTMLComponent, GUIComponent):
-       def __init__(self, list, enableWrapAround=False, content=eListboxPythonStringContent):
-               GUIComponent.__init__(self)
-               self.list = list
-               self.l = content()
-               self.l.setList(self.list)
-               self.onSelectionChanged = [ ]
-               self.enableWrapAround = enableWrapAround
-
-       def getCurrent(self):
-               return self.l.getCurrentSelection()
-
-       GUI_WIDGET = eListbox
-
+class TestResultList(MenuList):
        def postWidgetCreate(self, instance):
                self.instance.setSelectionEnable(0)
                instance.setContent(self.l)
@@ -44,52 +31,10 @@ class TestResultList(HTMLComponent, GUIComponent):
                if self.enableWrapAround:
                        self.instance.setWrapAround(True)
 
-       def preWidgetRemove(self, instance):
-               instance.setContent(None)
-               instance.selectionChanged.get().remove(self.selectionChanged)
-
-       def selectionChanged(self):
-               for f in self.onSelectionChanged:
-                       f()
-
-       def getSelectionIndex(self):
-               return self.l.getCurrentSelectionIndex()
-
-       def getSelectedIndex(self):
-               return self.l.getCurrentSelectionIndex()
-
-       def setList(self, list):
-               self.list = list
-               self.l.setList(self.list)
-
        def updateList(self, list):
                self.list = list
                self.l.setList(self.list)
 
-       def moveToIndex(self, idx):
-               if self.instance is not None:
-                       self.instance.moveSelectionTo(idx)
-
-       def pageUp(self):
-               if self.instance is not None:
-                       self.instance.moveSelection(self.instance.pageUp)
-
-       def pageDown(self):
-               if self.instance is not None:
-                       self.instance.moveSelection(self.instance.pageDown)
-
-       def up(self):
-               if self.instance is not None:
-                       self.instance.moveSelection(self.instance.moveUp)
-
-       def down(self):
-               if self.instance is not None:
-                       self.instance.moveSelection(self.instance.moveDown)
-
-       def selectionEnabled(self, enabled):
-               if self.instance is not None:
-                       self.instance.setSelectionEnable(enabled)
-
 class FactoryTest(Screen):
        skin = """
                <screen position="120,125" size="440,400" title="Test Menu" >
@@ -414,7 +359,9 @@ class FactoryTest(Screen):
        def getModelInfo(self):
                getmodel = 0
                if fileExists("/proc/stb/info/vumodel"):
-                       info = open("/proc/stb/info/vumodel").read().strip()
+                       vumodel = open("/proc/stb/info/vumodel")
+                       info=vumodel.read().strip()
+                       vumodel.close()
                        if info == "duo":
                                self.model = 0
                                getmodel = 1
@@ -435,8 +382,11 @@ class FactoryTest(Screen):
                                self.model = 4
                                getmodel = 1
                                print "getModelInfo : ultimo"
+
                if getmodel == 0 and fileExists("/proc/stb/info/version"):
-                       info = open("/proc/stb/info/version").read()
+                       vesion = open("/proc/stb/info/version")
+                       info=version.read()
+                       version.close()
                        if info[:2] == "14":
                                self.model = 1
                                print "getModelInfo : solo_"
@@ -497,12 +447,14 @@ class FactoryTest(Screen):
                                day = version[10:12]
                                date = '-'.join((year, month, day))
                                break;
+               file.close()
                return date
 
        def getversion(self):
                try:
                        fd = open("/proc/stb/info/version","r")
                        version = fd.read()
+                       fd.close()
                        self["testversion"].setText(("Version %s"%version))
                except:
                        self["testversion"].setText(("Version no load"))
@@ -1268,7 +1220,9 @@ class MacConfig(Screen):
        def getModelInfo(self):
                getmodel = 0
                if fileExists("/proc/stb/info/vumodel"):
-                       info = open("/proc/stb/info/vumodel").read().strip()
+                       vumodel = open("/proc/stb/info/vumodel")
+                       info=vumodel.read().strip()
+                       vumodel.close()
                        if info == "combo":
                                self.model = 2
                                getmodel = 1
@@ -1290,9 +1244,10 @@ class MacConfig(Screen):
                                getmodel = 1
                                print "getModelInfo : ultimo"
 
-
                if getmodel == 0 and fileExists("/proc/stb/info/version"):
-                       info = open("/proc/stb/info/version").read()
+                       version = open("/proc/stb/info/version")
+                       info=version.read()
+                       version.close()
 #                      print info,info[:2]
                        if info[:2] == "14":
                                self.model = 1
@@ -1873,8 +1828,14 @@ class RS232Test(Screen):
                                        rstest = 0 
                        else:
                                rstest = 0
+                       rs.close()
                except:
-                       print 'error'
+                       try:
+                               if rs:
+                                       rs.close()
+                       except:
+                               pass
+                       print 'except error'
                        rstest = 0
                if rstest == 0:
                        self.session.open( MessageBox, _("RS232 Test Failed!\nPress 'EXIT' button!"), MessageBox.TYPE_ERROR)