From 2d0e90b2dc7fade25429f3d3bc8ea519cc446e19 Mon Sep 17 00:00:00 2001 From: James Lu Date: Sat, 14 Nov 2015 16:19:11 -0800 Subject: [PATCH] Wikifetch: Limit supybot.commands import to remove __builtins__.any hack --- Wikifetch/plugin.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Wikifetch/plugin.py b/Wikifetch/plugin.py index e6fe0be..399070e 100644 --- a/Wikifetch/plugin.py +++ b/Wikifetch/plugin.py @@ -35,7 +35,7 @@ import re import sys import lxml.html import supybot.utils as utils -from supybot.commands import * +from supybot.commands import wrap, getopts, additional import supybot.plugins as plugins import supybot.ircutils as ircutils import supybot.callbacks as callbacks @@ -54,12 +54,6 @@ if sys.version_info[0] >= 3: else: from urllib import quote_plus -# Some smart person decided to override the any and all builtins, causing it to break on genexpr... -if isinstance(__builtins__, dict): - any = __builtins__['any'] -else: - any = __builtins__.any - class Wikifetch(callbacks.Plugin): """Grabs data from Wikipedia and other MediaWiki-powered sites.""" threaded = True