From 8574da46b113b62d829b49f648194d1c7b81f2c0 Mon Sep 17 00:00:00 2001 From: James Lu Date: Sun, 16 Jul 2017 07:43:36 -0700 Subject: [PATCH] PkgInfo: fix __bulitins__ access on Python 2.x? --- PkgInfo/plugin.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/PkgInfo/plugin.py b/PkgInfo/plugin.py index e3d46e2..31621ab 100644 --- a/PkgInfo/plugin.py +++ b/PkgInfo/plugin.py @@ -53,13 +53,8 @@ except ImportError: " at http://www.crummy.com/software/BeautifulSoup/bs4/" "doc/#installing-beautiful-soup") -# supybot.commands overrides any by default which is horrible ... -# Also horrible is how accessing items from __builtins__ requires different -# syntax on Python 2 and 3. -if sys.version_info[0] >= 3: - any = __builtins__['any'] -else: - any = __builtins__.any +# Use __builtins__.any and not the supybot.commands version... +any = __builtins__['any'] if isinstance(__builtins__, dict) else __builtins__.any try: from supybot.i18n import PluginInternationalization