diff options
| author | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2009-11-07 13:53:41 +0100 |
|---|---|---|
| committer | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2009-11-07 13:53:41 +0100 |
| commit | 2fded86dd8d04e121436ec88ab8d1a967a70628f (patch) | |
| tree | 669aedd55783df19cb69f9b6b48de62c176a20eb /lib/python | |
| parent | bbb82688540582d2049b584e5263cbc0423fb551 (diff) | |
| parent | d883e2231e61eaeed7929088f249334a66731b77 (diff) | |
| download | enigma2-2fded86dd8d04e121436ec88ab8d1a967a70628f.tar.gz enigma2-2fded86dd8d04e121436ec88ab8d1a967a70628f.zip | |
Merge branch 'master' into experimental
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/Components/NimManager.py | 7 | ||||
| -rwxr-xr-x | lib/python/Components/config.py | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/python/Components/NimManager.py b/lib/python/Components/NimManager.py index c339947c..3c3aa26c 100644 --- a/lib/python/Components/NimManager.py +++ b/lib/python/Components/NimManager.py @@ -565,9 +565,10 @@ class NimManager: if self.hasNimType("DVB-S"): print "Reading satellites.xml" db.readSatellites(self.satList, self.satellites, self.transponders) -# print "SATLIST", self.satList -# print "SATS", self.satellites -# print "TRANSPONDERS", self.transponders + self.satList.sort(key = lambda x: x[0]) # sort by orbpos + #print "SATLIST", self.satList + #print "SATS", self.satellites + #print "TRANSPONDERS", self.transponders if self.hasNimType("DVB-C"): print "Reading cables.xml" diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py index a1f3d2c3..a596b96d 100755 --- a/lib/python/Components/config.py +++ b/lib/python/Components/config.py @@ -1184,7 +1184,6 @@ class ConfigSatlist(ConfigSelection): def __init__(self, list, default = None): if default is not None: default = str(default) - list.sort(key = lambda x: int(x[0])) self._satList = list choices = [(str(orbpos), desc) for (orbpos, desc, flags) in list] |