From 0e950154103ba9385b13f76548befa87509995f3 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Sat, 16 Aug 2014 22:37:25 +0200
Subject: Remove sys.version_info checks for python2 and clean some imports.

---
 slixmpp/basexmpp.py | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'slixmpp/basexmpp.py')

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):
 
     """
-- 
cgit v1.2.3