import fixes

diff --git a/lastfm/src/LastFM.py b/lastfm/src/LastFM.py
index a5c7483..fa18379 100755 (executable)
--- a/lastfm/src/LastFM.py
+++ b/lastfm/src/LastFM.py
@@ -4,7 +4,7 @@ from md5 import md5 # to encode password
 from string import split, rstrip
 
 from time import time
-import xml.dom.minidom import parseString
+from xml.dom.minidom import parseString
 \r
 \r
 \r

diff --git a/movietagger/src/plugin.py b/movietagger/src/plugin.py
index 54ac468..0a7a27b 100644 (file)
--- a/movietagger/src/plugin.py
+++ b/movietagger/src/plugin.py
@@ -13,7 +13,7 @@ from Components.ActionMap import ActionMap
 from Components.GUIComponent import GUIComponent
 from Components.HTMLComponent import HTMLComponent
 from Components.MultiContent import MultiContentEntryText
-from enigma import eListboxPythonMultiContent, eListbox, eServiceCenter
+from enigma import eListboxPythonMultiContent, eListbox, eServiceCenter, gFont
 
 from Tools.Directories import *
 

diff --git a/netcaster/src/bin/plugin.py b/netcaster/src/bin/plugin.py
index f82c450..531c324 100644 (file)
--- a/netcaster/src/bin/plugin.py
+++ b/netcaster/src/bin/plugin.py
@@ -9,7 +9,7 @@ from Components.MenuList import MenuList
 from Components.HTMLComponent import HTMLComponent
 from Components.GUIComponent import GUIComponent
 from Components.MultiContent import MultiContentEntryText
-from enigma import eListboxPythonMultiContent
+from enigma import eListboxPythonMultiContent, eListbox, gFont
 
 from Plugins.Plugin import PluginDescriptor
 from os import path as os_path, listdir as os_listdir

diff --git a/webinterface/src/WebChilds/Notepad.py b/webinterface/src/WebChilds/Notepad.py
index 61e7c1c..d3fe81b 100755 (executable)
--- a/webinterface/src/WebChilds/Notepad.py
+++ b/webinterface/src/WebChilds/Notepad.py
@@ -1,7 +1,7 @@
-from os import path as os_path \
-       listdir as os_listdir \
-       system as os_system \
-       stat as os_stat \
+from os import path as os_path, \
+       listdir as os_listdir, \
+       system as os_system, \
+       stat as os_stat, \
        mkdir as os_mkdir
 from twisted.web2 import resource, responsecode, http,http_headers
 

diff --git a/wirelesslan/src/iwlibs.py b/wirelesslan/src/iwlibs.py
index 2a75e0d..0c79d91 100644 (file)
--- a/wirelesslan/src/iwlibs.py
+++ b/wirelesslan/src/iwlibs.py
@@ -20,10 +20,9 @@
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 #    USA 
 
-from import struct import pack as struct_pack, \
+from struct import parse_data, pack as struct_pack, \
        unpack as struct_unpack, \
-       calcsize as struct_calcsize, \
-       parse_data as struct_parse_data
+       calcsize as struct_calcsize
 
 from array import array
 from math import ceil, log10
@@ -698,7 +697,7 @@ class Iwstats(object):
         """ unpacks iwstruct data """
         struct = Iwstruct()
         iwqual = Iwquality()
-        iwstats_data = struct_parse_data(self.fmt, data)
+        iwstats_data = parse_data(self.fmt, data)
         
         self.status = iwstats_data[0:2]
         self.qual.quality, self.qual.sl, self.qual.nl,\
@@ -721,7 +720,7 @@ class Iwquality(object):
     def parse(self, data):
         """ unpacks iwquality data """
         struct = Iwstruct()
-        qual, sl, nl, flags = struct_parse_data(self.fmt, data)
+        qual, sl, nl, flags = parse_data(self.fmt, data)
 
         # compute signal and noise level
         self.signal_level = sl
@@ -883,7 +882,7 @@ class Iwrange(object):
         
     def _parse(self, data):
         struct = Iwstruct()
-        result = struct_parse_data(self.fmt, data)
+        result = parse_data(self.fmt, data)
         
         # XXX there is maybe a much more elegant way to do this
         self.throughput, self.min_nwid, self.max_nwid = result[0:3]