diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2014-08-16 22:37:25 +0200 |
|---|---|---|
| committer | Florent Le Coz <louiz@louiz.org> | 2014-09-01 02:42:45 +0200 |
| commit | 0e950154103ba9385b13f76548befa87509995f3 (patch) | |
| tree | 14f38018f0ca25deed5729c7f4c9fd84779e5655 /slixmpp/plugins/base.py | |
| parent | b92dac72f3bb601837dde507597d47715c5ad1aa (diff) | |
| download | slixmpp-0e950154103ba9385b13f76548befa87509995f3.tar.gz slixmpp-0e950154103ba9385b13f76548befa87509995f3.tar.bz2 slixmpp-0e950154103ba9385b13f76548befa87509995f3.tar.xz slixmpp-0e950154103ba9385b13f76548befa87509995f3.zip | |
Remove sys.version_info checks for python2 and clean some imports.
Diffstat (limited to 'slixmpp/plugins/base.py')
| -rw-r--r-- | slixmpp/plugins/base.py | 6 |
1 files changed, 1 insertions, 5 deletions
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: |