diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2009-02-13 14:47:32 +0100 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2009-02-13 14:47:32 +0100 |
| commit | 4510fa62a33b31fec442fd0d77eb682d93ebf7e6 (patch) | |
| tree | b5658cf227ea59640a09a890e96a22bfa814cea6 /lib/python/Tools/Transponder.py | |
| parent | eccbf5ccedceaf21d4d2557e5ef12ef9a53930ca (diff) | |
| parent | a2897a03034c3a2c176df4fdd2f7f5d32d830270 (diff) | |
| download | enigma2-4510fa62a33b31fec442fd0d77eb682d93ebf7e6.tar.gz enigma2-4510fa62a33b31fec442fd0d77eb682d93ebf7e6.zip | |
Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs
Conflicts:
lib/python/Components/Converter/StringList.py
Diffstat (limited to 'lib/python/Tools/Transponder.py')
| -rw-r--r-- | lib/python/Tools/Transponder.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/python/Tools/Transponder.py b/lib/python/Tools/Transponder.py index f37603c5..6868929c 100644 --- a/lib/python/Tools/Transponder.py +++ b/lib/python/Tools/Transponder.py @@ -1,8 +1,9 @@ from enigma import eDVBFrontendParametersSatellite, eDVBFrontendParametersCable, eDVBFrontendParametersTerrestrial -def ConvertToHumanReadable(tp): +def ConvertToHumanReadable(tp, type = None): ret = { } - type = tp.get("tuner_type", "None") + if type is None: + type = tp.get("tuner_type", "None") if type == "DVB-S": ret["tuner_type"] = _("Satellite") ret["inversion"] = { @@ -111,6 +112,8 @@ def ConvertToHumanReadable(tp): eDVBFrontendParametersTerrestrial.Inversion_Unknown : _("Auto"), eDVBFrontendParametersTerrestrial.Inversion_On : _("On"), eDVBFrontendParametersTerrestrial.Inversion_Off : _("Off")}[tp["inversion"]] + else: + print "ConvertToHumanReadable: no or unknown type in tpdata dict!" for x in tp.keys(): if not ret.has_key(x): ret[x] = tp[x] |