Remove sys.version_info checks for python2 and clean some imports.

tests/test_overall.py

@@ -15,10 +15,7 @@ class TestOverall(unittest.TestCase):
     def testModules(self):
         """Testing all modules by compiling them"""
         src = '.%sslixmpp' % os.sep
-        if sys.version_info < (3, 0):
-            rx = re.compile('/[.]svn')
-        else:
-            rx = re.compile('/[.]svn|.*26.*')
+        rx = re.compile('/[.]svn|.*26.*')
         self.failUnless(compileall.compile_dir(src, rx=rx, quiet=True))
 
     def testTabNanny(self):

tests/test_stanza_xep_0009.py

@@ -24,10 +24,6 @@ from slixmpp.xmlstream.tostring import tostring
 import unittest
 
 
-if sys.version_info > (3, 0):
-    unicode = str
-
-
 class TestJabberRPC(SlixTest):
 
     def setUp(self):