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/basexmpp.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/basexmpp.py')
-rw-r--r-- | slixmpp/basexmpp.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/slixmpp/basexmpp.py b/slixmpp/basexmpp.py index 0b133f6d..b15354c9 100644 --- a/slixmpp/basexmpp.py +++ b/slixmpp/basexmpp.py @@ -12,9 +12,6 @@ :license: MIT, see LICENSE for more details """ -from __future__ import with_statement, unicode_literals - -import sys import logging import threading @@ -38,13 +35,6 @@ from slixmpp.plugins import PluginManager, load_plugin log = logging.getLogger(__name__) -# In order to make sure that Unicode is handled properly -# in Python 2.x, reset the default encoding. -if sys.version_info < (3, 0): - from slixmpp.util.misc_ops import setdefaultencoding - setdefaultencoding('utf8') - - class BaseXMPP(XMLStream): """ |