fix *required* kwargs. plugins not having **kwargs will probably not run with newer...

diff --git a/lib/python/Plugins/Extensions/FritzCall/plugin.py b/lib/python/Plugins/Extensions/FritzCall/plugin.py
index 0b67345bbd339adb124622f8ebba2b92cbc4f477..be76f79e12987842c4a3a1fe2481cf0f99c88a87 100644 (file)
--- 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
 
                        self.d[1].disconnect()
                        self.d = None
 

-def main(session):
+def main(session, **kwargs):

        session.open(FritzCallSetup)
 
 fritz_call = None
        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 f6dfc9658dc115862ded60b323f96126ba9a9a34..d9a3d4908d428157ea6e1523bd82bdc7d8d75ec9 100644 (file)
--- 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_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
        # 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...", 
                                ], 
                        name = "Ipkg", 
                        description = "Install software updates...", 

-                       openfnc = filescan_open, 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               )
-               
+                       openfnc = filescan_open, )
+

 def Plugins(**kwargs):
 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 c54669bb5d60dafffead06ac3db1c708110c28ef..4462df139b9fc7008cd8b1c5844536a837540540 100644 (file)
--- 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_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
        # 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 980fe5d53830ea96c046f26603ce25ce2d4007cf..b52183580f6ace2c2fcdb89158a68fb222888994 100644 (file)
--- 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
 
 
 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
 
 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
 
                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"
        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 9ee477710d4bb09d69eef25aa3ed0518b11b64f1..25cad5c4406ee0fe6589c6cdb0f611224fe9b476 100644 (file)
--- 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)
 
                        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:
        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 73ecd0fa2408742850e20399c3496a9dd215bffc..eb20b464c2c45e090a75adad25305250b1347e9a 100644 (file)
--- 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)
 
                        else:
                                session.open(NimSelection)
 

-def SatfinderStart(menuid):
+def SatfinderStart(menuid, **kwargs):

        if menuid == "scan":
                return [(_("Satfinder"), SatfinderMain)]
        else:
        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 5a130ba1541d2f2ece79ad1d0ee4cae0a41e82e3..d92211753ce142b8f68ab58cfb4bea226ecb9fa0 100755 (executable)
--- 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 SkinSelMain(session, **kwargs):
        session.open(SkinSelector)
 

-def SkinSelSetup(menuid):
+def SkinSelSetup(menuid, **kwargs):

        if menuid == "system":
                return [("Skin...", SkinSelMain)]
        else:
        if menuid == "system":
                return [("Skin...", SkinSelMain)]
        else: