From 0e950154103ba9385b13f76548befa87509995f3 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Sat, 16 Aug 2014 22:37:25 +0200 Subject: Remove sys.version_info checks for python2 and clean some imports. --- slixmpp/plugins/base.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'slixmpp/plugins/base.py') diff --git a/slixmpp/plugins/base.py b/slixmpp/plugins/base.py index 9694a414..d3f751fb 100644 --- a/slixmpp/plugins/base.py +++ b/slixmpp/plugins/base.py @@ -19,10 +19,6 @@ import logging import threading -if sys.version_info >= (3, 0): - unicode = str - - log = logging.getLogger(__name__) @@ -89,7 +85,7 @@ def load_plugin(name, module=None): module = 'slixmpp.features.%s' % name __import__(module) mod = sys.modules[module] - elif isinstance(module, (str, unicode)): + elif isinstance(module, str): __import__(module) mod = sys.modules[module] else: -- cgit v1.2.3