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 /tests | |
| 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 'tests')
| -rw-r--r-- | tests/test_overall.py | 5 | ||||
| -rw-r--r-- | tests/test_stanza_xep_0009.py | 4 |
2 files changed, 1 insertions, 8 deletions
diff --git a/tests/test_overall.py b/tests/test_overall.py index 411ebcdf..3f32913c 100644 --- a/tests/test_overall.py +++ b/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): diff --git a/tests/test_stanza_xep_0009.py b/tests/test_stanza_xep_0009.py index 4392ca14..f1a61b80 100644 --- a/tests/test_stanza_xep_0009.py +++ b/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): |