diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2007-07-28 09:18:29 +0000 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2007-07-28 09:18:29 +0000 |
| commit | f09c607ad3904b0adfe65a3f4519d79861711d4b (patch) | |
| tree | 2bd78d8f2d8295eaa52545afb2cc472b765a916a /lib/python/Plugins/Extensions | |
| parent | 51a80d8a7f6a339a214db9e012feadb66322d380 (diff) | |
| download | enigma2-f09c607ad3904b0adfe65a3f4519d79861711d4b.tar.gz enigma2-f09c607ad3904b0adfe65a3f4519d79861711d4b.zip | |
fix *required* kwargs. plugins not having **kwargs will probably not run with newer enigma2, but this has been documented since the beginning.
Diffstat (limited to 'lib/python/Plugins/Extensions')
4 files changed, 9 insertions, 9 deletions
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" |