From 2cfe0f679f6c9b79da3ba37569346cb4847a75e8 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Tue, 20 Sep 2016 23:09:29 +0200 Subject: [PATCH] Fix previous commit on some Python versions. --- plugins/RSS/plugin.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/RSS/plugin.py b/plugins/RSS/plugin.py index 50f5e1de0..f74576f0b 100644 --- a/plugins/RSS/plugin.py +++ b/plugins/RSS/plugin.py @@ -386,8 +386,12 @@ class RSS(callbacks.Plugin): blacklist = self.registryValue('keywordBlacklist', channel) # fix shadowing by “from supybot.commands import *” - all = __builtins__.all - any = __builtins__.any + try: + all = __builtins__.all + any = __builtins__.any + except AttributeError: + all = __builtins__['all'] + any = __builtins__['any'] if whitelist: if all(kw not in entry.title and kw not in entry.description