diff options
Diffstat (limited to 'module/plugins')
| -rw-r--r-- | module/plugins/hooks/ExternalScripts.py | 12 | ||||
| -rw-r--r-- | module/plugins/internal/Hoster.py | 20 |
2 files changed, 24 insertions, 8 deletions
diff --git a/module/plugins/hooks/ExternalScripts.py b/module/plugins/hooks/ExternalScripts.py index bfe7a595b..3bda8a778 100644 --- a/module/plugins/hooks/ExternalScripts.py +++ b/module/plugins/hooks/ExternalScripts.py @@ -10,7 +10,7 @@ from module.plugins.internal.misc import encode class ExternalScripts(Addon): __name__ = "ExternalScripts" __type__ = "hook" - __version__ = "0.61" + __version__ = "0.62" __status__ = "testing" __config__ = [("activated", "bool", "Activated" , True ), @@ -110,16 +110,14 @@ class ExternalScripts(Addon): def call_script(self, folder, *args, **kwargs): scripts = self.scripts.get(folder) - if folder not in scripts: - self.log_debug("Folder `%s` not found" % folder) - return - - scripts = self.scripts.get(folder) - if not scripts: self.log_debug("No script found under folder `%s`" % folder) return + if folder not in scripts: + self.log_debug("Folder `%s` not found" % folder) + return + self.log_info(_("Executing %s scripts...") % folder) for file in scripts: diff --git a/module/plugins/internal/Hoster.py b/module/plugins/internal/Hoster.py index 8b5e975d3..1914fbfd4 100644 --- a/module/plugins/internal/Hoster.py +++ b/module/plugins/internal/Hoster.py @@ -13,10 +13,28 @@ from module.plugins.internal.Plugin import Fail, Retry from module.plugins.internal.misc import compute_checksum, encode, exists, fixurl, fsjoin, parse_name, safejoin +# Python 2.5 compatibility hack for property.setter, property.deleter +import __builtin__ +if not hasattr(__builtin__.property, "setter"): + class property(__builtin__.property): + __metaclass__ = type + + def setter(self, method): + return property(self.fget, method, self.fdel) + + def deleter(self, method): + return property(self.fget, self.fset, method) + + @__builtin__.property + def __doc__(self): + """Doc seems not to be set correctly when subclassing""" + return self.fget.__doc__ + + class Hoster(Base): __name__ = "Hoster" __type__ = "hoster" - __version__ = "0.47" + __version__ = "0.48" __status__ = "stable" __pattern__ = r'^unmatchable$' |