use single argument only

diff --git a/lib/python/Components/Converter/ClockToText.py b/lib/python/Components/Converter/ClockToText.py
index 3abfffc507c093412549fc14583b2ebce84aa594..5d5df65113b455bb17df46778c3ca2e8844fdc72 100644 (file)
--- a/lib/python/Components/Converter/ClockToText.py
+++ b/lib/python/Components/Converter/ClockToText.py
@@ -10,8 +10,8 @@ class ClockToText(Converter, object):
        # add: date, date as string, weekday, ... 
        # (whatever you need!)
        
-       def __init__(self, type, *args, **kwargs):
-               Converter.__init__(self)
+       def __init__(self, type):
+               Converter.__init__(self, type)
                if type == "WithSeconds":
                        self.type = self.WITH_SECONDS
                elif type == "InMinutes":

diff --git a/lib/python/Components/Converter/ConditionalShowHide.py b/lib/python/Components/Converter/ConditionalShowHide.py
index 56fb1453aef5e14a8debef7b59c91fc60da369fe..9f1f86b26bf181bce681679d3deaa1b1629140dc 100644 (file)
--- a/lib/python/Components/Converter/ConditionalShowHide.py
+++ b/lib/python/Components/Converter/ConditionalShowHide.py
@@ -2,8 +2,8 @@ from Converter import Converter
 
 class ConditionalShowHide(Converter, object):
 
-       def __init__(self, type, *args, **kwargs):
-               Converter.__init__(self)
+       def __init__(self, type):
+               Converter.__init__(self, type)
                self.invert = type == "Invert"
 
        def changed(self):

diff --git a/lib/python/Components/Converter/Converter.py b/lib/python/Components/Converter/Converter.py
index 3f054c12ea284b46bcd3a486f424dc9e4b003ab7..709eff94b6c10c9f7018f7ad659bf88d1a0676c7 100644 (file)
--- a/lib/python/Components/Converter/Converter.py
+++ b/lib/python/Components/Converter/Converter.py
@@ -1,4 +1,9 @@
 from Components.Element import Element
 
 class Converter(Element):
-       pass
+       def __init__(self, arguments):
+               Element.__init__(self)
+               self.converter_arguments = arguments
+
+       def __repr__(self):
+               return str(type(self)) + "(" + self.converter_arguments + ")"

diff --git a/lib/python/Components/Converter/EventName.py b/lib/python/Components/Converter/EventName.py
index e391b95f358599584130718ddd0d7ef55ee07855..2b95d94526d616bdb153be2d2f7d16be1a724275 100644 (file)
--- a/lib/python/Components/Converter/EventName.py
+++ b/lib/python/Components/Converter/EventName.py
@@ -5,8 +5,8 @@ class EventName(Converter, object):
        SHORT_DESCRIPTION = 1
        EXTENDED_DESCRIPTION = 2
 
-       def __init__(self, type, *args, **kwargs):
-               Converter.__init__(self)
+       def __init__(self, type):
+               Converter.__init__(self, type)
                if type == "Description":
                        self.type = self.SHORT_DESCRIPTION
                elif type == "ExtendedDescription":
@@ -17,7 +17,7 @@ class EventName(Converter, object):
        def getText(self):
                event = self.source.event
                if event is None:
-                       return ""
+                       return "N/A"
                        
                if self.type == self.NAME:
                        return event.getEventName()

diff --git a/lib/python/Components/Converter/EventTime.py b/lib/python/Components/Converter/EventTime.py
index 3c312a69e844bcfede9233963d91d0077f4b9980..09fe6bff54422c3e59d5cfd32754b6fdd99305c1 100644 (file)
--- a/lib/python/Components/Converter/EventTime.py
+++ b/lib/python/Components/Converter/EventTime.py
@@ -9,8 +9,8 @@ class EventTime(Poll, Converter, object):
        PROGRESS = 3
        DURATION = 4
 
-       def __init__(self, type, *args, **kwargs):
-               Converter.__init__(self)
+       def __init__(self, type):
+               Converter.__init__(self, type)
                Poll.__init__(self)
                if type == "EndTime":
                        self.type = self.ENDTIME

diff --git a/lib/python/Components/Converter/FrontendInfo.py b/lib/python/Components/Converter/FrontendInfo.py
index 8e05813ca5b9cfe65ddf3e8b8ff5b769e759b8ca..347f7a13b97d8a12a23afef76f4c1239ea7fd646 100644 (file)
--- a/lib/python/Components/Converter/FrontendInfo.py
+++ b/lib/python/Components/Converter/FrontendInfo.py
@@ -6,8 +6,8 @@ class FrontendInfo(Converter, object):
        AGC = 2
        LOCK = 3
 
-       def __init__(self, type, *args, **kwargs):
-               Converter.__init__(self)
+       def __init__(self, type):
+               Converter.__init__(self, type)
                if type == "BER":
                        self.type = self.BER
                elif type == "SNR":

diff --git a/lib/python/Components/Converter/RemainingToText.py b/lib/python/Components/Converter/RemainingToText.py
index 534fef1885183c930cd74b4a0c6e3ffcaffb677e..007095e084e8ef8beefd2f9c6c9381d6af41494b 100644 (file)
--- a/lib/python/Components/Converter/RemainingToText.py
+++ b/lib/python/Components/Converter/RemainingToText.py
@@ -1,8 +1,8 @@
 from Components.Converter.Converter import Converter
 
 class RemainingToText(Converter, object):
-       def __init__(self, type, *args, **kwargs):
-               Converter.__init__(self)
+       def __init__(self, type):
+               Converter.__init__(self, type)
 
        def getText(self):
 

diff --git a/lib/python/Components/Converter/ServiceInfo.py b/lib/python/Components/Converter/ServiceInfo.py
index 4b266fed54e58e1ca8abc5ab7e01a7253fa12dfe..f9b65c1975b1b523afdacc9ba235d3fcc99fb7d3 100644 (file)
--- a/lib/python/Components/Converter/ServiceInfo.py
+++ b/lib/python/Components/Converter/ServiceInfo.py
@@ -8,8 +8,8 @@ class ServiceInfo(Converter, object):
        IS_WIDESCREEN = 3
        SUBSERVICES_AVAILABLE = 4
 
-       def __init__(self, type, *args, **kwargs):
-               Converter.__init__(self)
+       def __init__(self, type):
+               Converter.__init__(self, type)
                self.type = {
                                "HasTelext": self.HAS_TELETEXT,
                                "IsMultichannel": self.IS_MULTICHANNEL,

diff --git a/lib/python/Components/Converter/ServiceName.py b/lib/python/Components/Converter/ServiceName.py
index 77647dd05dd40fc14a66b6f585f5455254f39aa6..78a3dca2542cf9621887817cadb9e8b17185033c 100644 (file)
--- a/lib/python/Components/Converter/ServiceName.py
+++ b/lib/python/Components/Converter/ServiceName.py
@@ -5,8 +5,8 @@ class ServiceName(Converter, object):
        NAME = 0
        PROVIDER = 1
 
-       def __init__(self, type, *args, **kwargs):
-               Converter.__init__(self)
+       def __init__(self, type):
+               Converter.__init__(self, type)
                if type == "Provider":
                        self.type = self.PROVIDER
                else:

diff --git a/lib/python/Components/Converter/ServicePosition.py b/lib/python/Components/Converter/ServicePosition.py
index 871693338254aa4c0f6f0924d1e0f84cbb1adb10..e072aa5ec1646543f088692e634e6903598a42d9 100644 (file)
--- a/lib/python/Components/Converter/ServicePosition.py
+++ b/lib/python/Components/Converter/ServicePosition.py
@@ -8,9 +8,9 @@ class ServicePosition(Converter, Poll, object):
        TYPE_REMAINING = 2,
        TYPE_GAUGE = 3
        
-       def __init__(self, type, *args, **kwargs):
+       def __init__(self, type):
                Poll.__init__(self)
-               Converter.__init__(self)
+               Converter.__init__(self, type)
                if type == "Length":
                        self.type = self.TYPE_LENGTH
                elif type == "Position":

diff --git a/lib/python/Components/Converter/StaticText.py b/lib/python/Components/Converter/StaticText.py
index 12eb6ad5a07234472d689aebdceba7cf2d7c56a4..d3a67b24a461faeeb3d4163dba84ec510904fbaf 100644 (file)
--- a/lib/python/Components/Converter/StaticText.py
+++ b/lib/python/Components/Converter/StaticText.py
@@ -1,7 +1,7 @@
 from Components.Converter.Converter import Converter
 
 class StaticText(Converter, object):
-       def __init__(self, text, *args, **kwargs):
-               Converter.__init__(self)
+       def __init__(self, text):
+               Converter.__init__(self, type)
                self.text = str(text)
 

diff --git a/lib/python/Components/Converter/StringList.py b/lib/python/Components/Converter/StringList.py
index 31dbcd3c9ae1b21cb54dfd4ec5fec7339b7593dd..d542197684739588f4f488234d849f66c38a840c 100644 (file)
--- a/lib/python/Components/Converter/StringList.py
+++ b/lib/python/Components/Converter/StringList.py
@@ -4,8 +4,8 @@ from enigma import eListboxPythonStringContent
 
 class StringList(Converter):
        """Turns a simple python list into a list which can be used in a listbox."""
-       def __init__(self, *args, **kwargs):
-               Converter.__init__(self)
+       def __init__(self, type):
+               Converter.__init__(self, type)
 
        def changed(self):
                self.content = eListboxPythonStringContent()
@@ -14,7 +14,7 @@ class StringList(Converter):
                self.downstream_elements.changed()
 
        def selectionChanged(self, index):
-               self.upstream_elements.selectionChanged(index)
+               self.source.selectionChanged(index)
                # update all non-master targets
                for x in self.downstream_elements:
                        if x is not self.master:

diff --git a/lib/python/Components/Converter/ValueRange.py b/lib/python/Components/Converter/ValueRange.py
index 7fdbb481473fb0fd6cf2d82880eaef74d002bdeb..443e7a33f142b14e9ea7fb3d786d0117c25cdb9d 100644 (file)
--- a/lib/python/Components/Converter/ValueRange.py
+++ b/lib/python/Components/Converter/ValueRange.py
@@ -1,8 +1,8 @@
 from Converter import Converter
 
 class ValueRange(Converter, object):
-       def __init__(self, arg, *args, **kwargs):
-               Converter.__init__(self)
+       def __init__(self, arg):
+               Converter.__init__(self, arg)
                (self.lower, self.upper) = [int(x) for x in arg.split(',')]
 
        def getBoolean(self):