compatibility fixes to Python versions support

1 files changed, 7 insertions, 6 deletions

diff --git a/test/codec/ber/test_encoder.py b/test/codec/ber/test_encoder.py
index d1441b1..cd064b6 100644
--- a/test/codec/ber/test_encoder.py
+++ b/test/codec/ber/test_encoder.py
@@ -293,18 +293,19 @@ class RealEncoderTestCase(unittest.TestCase):
         
     def testZero(self):
         assert encoder.encode(univ.Real(0)) == ints2octs((9, 0))
-        
-class UniversalStringEncoderTestCase(unittest.TestCase):
-    def testEncoding(self):
-        assert encoder.encode(char.UniversalString(u'abc')) == ints2octs((28, 12, 0, 0, 0, 97, 0, 0, 0, 98, 0, 0, 0, 99)), 'Incorrect encoding'
+
+if version_info[0:2] > (2, 5):
+    class UniversalStringEncoderTestCase(unittest.TestCase):
+        def testEncoding(self):
+            assert encoder.encode(char.UniversalString(version_info[0] == 3 and 'abc' or unicode('abc'))) == ints2octs((28, 12, 0, 0, 0, 97, 0, 0, 0, 98, 0, 0, 0, 99)), 'Incorrect encoding'
         
 class BMPStringEncoderTestCase(unittest.TestCase):
     def testEncoding(self):
-        assert encoder.encode(char.BMPString(u'abc')) == ints2octs((30, 6, 0, 97, 0, 98, 0, 99)), 'Incorrect encoding'
+        assert encoder.encode(char.BMPString(version_info[0] == 3 and 'abc' or unicode('abc'))) == ints2octs((30, 6, 0, 97, 0, 98, 0, 99)), 'Incorrect encoding'
 
 class UTF8StringEncoderTestCase(unittest.TestCase):
     def testEncoding(self):
-        assert encoder.encode(char.UTF8String(u'abc')) == ints2octs((12, 3, 97, 98, 99)), 'Incorrect encoding'
+        assert encoder.encode(char.UTF8String(version_info[0] == 3 and 'abc' or unicode('abc'))) == ints2octs((12, 3, 97, 98, 99)), 'Incorrect encoding'
 
 class SequenceEncoderTestCase(unittest.TestCase):
     def setUp(self):