aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorFelix Domke <tmbinc@elitedvb.net>2006-07-24 23:55:12 +0000
committerFelix Domke <tmbinc@elitedvb.net>2006-07-24 23:55:12 +0000
commit911466bd5e018b80dfbbd5e12c4923e89a980792 (patch)
tree738e80806095f84510ca7efab7845b1fac4d95cb /lib/python
parent7d7331ac43c18159a7ebeb652e0e7d971118a8f7 (diff)
downloadenigma2-911466bd5e018b80dfbbd5e12c4923e89a980792.tar.gz
enigma2-911466bd5e018b80dfbbd5e12c4923e89a980792.zip
use single argument only
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/Components/Converter/ClockToText.py4
-rw-r--r--lib/python/Components/Converter/ConditionalShowHide.py4
-rw-r--r--lib/python/Components/Converter/Converter.py7
-rw-r--r--lib/python/Components/Converter/EventName.py6
-rw-r--r--lib/python/Components/Converter/EventTime.py4
-rw-r--r--lib/python/Components/Converter/FrontendInfo.py4
-rw-r--r--lib/python/Components/Converter/RemainingToText.py4
-rw-r--r--lib/python/Components/Converter/ServiceInfo.py4
-rw-r--r--lib/python/Components/Converter/ServiceName.py4
-rw-r--r--lib/python/Components/Converter/ServicePosition.py4
-rw-r--r--lib/python/Components/Converter/StaticText.py4
-rw-r--r--lib/python/Components/Converter/StringList.py6
-rw-r--r--lib/python/Components/Converter/ValueRange.py4
13 files changed, 32 insertions, 27 deletions
diff --git a/lib/python/Components/Converter/ClockToText.py b/lib/python/Components/Converter/ClockToText.py
index 3abfffc5..5d5df651 100644
--- 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 56fb1453..9f1f86b2 100644
--- 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 3f054c12..709eff94 100644
--- 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 e391b95f..2b95d945 100644
--- 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 3c312a69..09fe6bff 100644
--- 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 8e05813c..347f7a13 100644
--- 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 534fef18..007095e0 100644
--- 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 4b266fed..f9b65c19 100644
--- 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 77647dd0..78a3dca2 100644
--- 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 87169333..e072aa5e 100644
--- 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 12eb6ad5..d3a67b24 100644
--- 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 31dbcd3c..d5421976 100644
--- 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 7fdbb481..443e7a33 100644
--- 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):