From: Felix Domke <tmbinc@elitedvb.net>
Date: Sat, 28 Jul 2007 09:18:29 +0000 (+0000)
Subject: fix *required* kwargs. plugins not having **kwargs will probably not run with newer... 
X-Git-Tag: 2.6.0~2022
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/f09c607ad3904b0adfe65a3f4519d79861711d4b

fix *required* kwargs. plugins not having **kwargs will probably not run with newer enigma2, but this has been documented since the beginning.
---

diff --git a/lib/python/Plugins/Extensions/FritzCall/plugin.py b/lib/python/Plugins/Extensions/FritzCall/plugin.py
index 0b67345b..be76f79e 100644
--- a/lib/python/Plugins/Extensions/FritzCall/plugin.py
+++ b/lib/python/Plugins/Extensions/FritzCall/plugin.py
@@ -131,7 +131,7 @@ class FritzCall:
 			self.d[1].disconnect()
 			self.d = None
 
-def main(session):
+def main(session, **kwargs):
 	session.open(FritzCallSetup)
 
 fritz_call = None
diff --git a/lib/python/Plugins/Extensions/IpkgInstaller/plugin.py b/lib/python/Plugins/Extensions/IpkgInstaller/plugin.py
index f6dfc965..d9a3d490 100644
--- a/lib/python/Plugins/Extensions/IpkgInstaller/plugin.py
+++ b/lib/python/Plugins/Extensions/IpkgInstaller/plugin.py
@@ -49,7 +49,7 @@ class IpkgInstaller(Screen):
 def filescan_open(list, session, **kwargs):
 	session.open(IpkgInstaller, list) # list
 
-def filescan():
+def filescan(**kwargs):
 	# we expect not to be called if the MediaScanner plugin is not available,
 	# thus we don't catch an ImportError exception here
 	from Plugins.Extensions.MediaScanner.plugin import Scanner, ScanPath
@@ -62,8 +62,7 @@ def filescan():
 				], 
 			name = "Ipkg", 
 			description = "Install software updates...", 
-			openfnc = filescan_open, 
-																																																																)
-		
+			openfnc = filescan_open, )
+
 def Plugins(**kwargs):
-	return [ PluginDescriptor(name="Ipkg", where = PluginDescriptor.WHERE_FILESCAN, fnc = filescan) ]
\ No newline at end of file
+	return [ PluginDescriptor(name="Ipkg", where = PluginDescriptor.WHERE_FILESCAN, fnc = filescan) ]
diff --git a/lib/python/Plugins/Extensions/PicturePlayer/plugin.py b/lib/python/Plugins/Extensions/PicturePlayer/plugin.py
index c54669bb..4462df13 100644
--- a/lib/python/Plugins/Extensions/PicturePlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/PicturePlayer/plugin.py
@@ -533,7 +533,7 @@ def main(session, **kwargs):
 def filescan_open(list, session, **kwargs):
 	session.open(picmain) # list
 
-def filescan():
+def filescan(**kwargs):
 	# we expect not to be called if the MediaScanner plugin is not available,
 	# thus we don't catch an ImportError exception here
 	from Plugins.Extensions.MediaScanner.plugin import Scanner, ScanPath
diff --git a/lib/python/Plugins/Extensions/SimpleRSS/plugin.py b/lib/python/Plugins/Extensions/SimpleRSS/plugin.py
index 980fe5d5..b5218358 100644
--- a/lib/python/Plugins/Extensions/SimpleRSS/plugin.py
+++ b/lib/python/Plugins/Extensions/SimpleRSS/plugin.py
@@ -19,7 +19,8 @@ from sets import Set
 
 my_global_session = None
 
-urls = ["http://www.heise.de/newsticker/heise.rdf", "http://rss.slashdot.org/Slashdot/slashdot/to"]
+#urls = ["http://www.heise.de/newsticker/heise.rdf", "http://rss.slashdot.org/Slashdot/slashdot/to"]
+urls = ["http://mastermaq.podcastspot.com/episodes/rss/mpg1"]
 
 from Components.config import config, ConfigSubsection, ConfigSelection, getConfigListEntry
 from Components.ConfigList import ConfigListScreen
@@ -233,7 +234,7 @@ class RSSPoller:
 		self.poll_timer.timeout.get().remove(self.poll)
 		self.poll_timer = None
 
-def main(session):
+def main(session, **kwargs):
 	print "session.open"
 	session.open(SimpleRSS)
 	print "done"
diff --git a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
index 9ee47771..25cad5c4 100644
--- a/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
@@ -567,7 +567,7 @@ def PositionerMain(session, **kwargs):
 			else:
 				session.open(MessageBox, _("No tuner is configured for use with a diseqc positioner!"), MessageBox.TYPE_ERROR)
 
-def PositionerSetupStart(menuid):
+def PositionerSetupStart(menuid, **kwargs):
 	if menuid == "scan":
 		return [(_("Positioner setup"), PositionerMain)]
 	else:
diff --git a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
index 73ecd0fa..eb20b464 100644
--- a/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/Satfinder/plugin.py
@@ -277,7 +277,7 @@ def SatfinderMain(session, **kwargs):
 			else:
 				session.open(NimSelection)
 
-def SatfinderStart(menuid):
+def SatfinderStart(menuid, **kwargs):
 	if menuid == "scan":
 		return [(_("Satfinder"), SatfinderMain)]
 	else:
diff --git a/lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py b/lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py
index 5a130ba1..d9221175 100755
--- a/lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/SkinSelector/plugin.py
@@ -129,7 +129,7 @@ class SkinSelector(Screen):
 def SkinSelMain(session, **kwargs):
 	session.open(SkinSelector)
 
-def SkinSelSetup(menuid):
+def SkinSelSetup(menuid, **kwargs):
 	if menuid == "system":
 		return [("Skin...", SkinSelMain)]
 	else: