From ed40f6f85c9c07c3c1224ae20601082c0309a631 Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Tue, 19 Dec 2006 02:12:57 +0000 Subject: some python import cleanups lesser swig overhead --- .../SystemPlugins/OldSoftwareUpdate/plugin.py | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) (limited to 'lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py') diff --git a/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py b/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py index 72279c1a..0f6c4e84 100644 --- a/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py +++ b/lib/python/Plugins/SystemPlugins/OldSoftwareUpdate/plugin.py @@ -1,4 +1,4 @@ -from enigma import * +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 @@ -10,7 +10,7 @@ from Components.Input import Input from Screens.Console import Console from Plugins.Plugin import PluginDescriptor -import os +from os import popen class Upgrade(Screen): skin = """ @@ -43,7 +43,7 @@ class Upgrade(Screen): self.close() def doUpdateDelay(self): - lines = os.popen("ipkg update && ipkg upgrade -force-defaults -force-overwrite", "r").readlines() + lines = popen("ipkg update && ipkg upgrade -force-defaults -force-overwrite", "r").readlines() string = "" for x in lines: string += x @@ -58,15 +58,6 @@ class Upgrade(Screen): else: self.close() -RT_HALIGN_LEFT = 0 -RT_HALIGN_RIGHT = 1 -RT_HALIGN_CENTER = 2 -RT_HALIGN_BLOCK = 4 - -RT_VALIGN_TOP = 0 -RT_VALIGN_CENTER = 8 -RT_VALIGN_BOTTOM = 16 - def PacketEntryComponent(packet): res = [ packet ] @@ -122,13 +113,13 @@ class Ipkg(Screen): def fillPacketList(self): - lines = os.popen("ipkg list", "r").readlines() + lines = popen("ipkg list", "r").readlines() packetlist = [] for x in lines: split = x.split(' - ') packetlist.append([split[0].strip(), split[1].strip()]) - lines = os.popen("ipkg list_installed", "r").readlines() + lines = popen("ipkg list_installed", "r").readlines() installedlist = {} for x in lines: @@ -151,7 +142,7 @@ class Ipkg(Screen): self.close() def doUpdateDelay(self): - lines = os.popen("ipkg update && ipkg upgrade", "r").readlines() + lines = popen("ipkg update && ipkg upgrade", "r").readlines() string = "" for x in lines: string += x -- cgit v1.2.3