optionalg
diff --git a/‎codext/VERSION.txt‎
Lines changed: 1 addition & 1 deletion b/‎codext/VERSION.txt‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎codext/binary/baudot.py‎
Lines changed: 1 addition & 1 deletion b/‎codext/binary/baudot.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎tests/test_common.py‎
Lines changed: 17 additions & 1 deletion b/‎tests/test_common.py‎
Lines changed: 17 additions & 1 deletion
@@ -1 +1 @@
-1.5.5
+1.6.1
@@ -13,7 +13,7 @@
 __CODES = ["ccitt1", "ccitt2", "eu", "ita1", "ita2", "ita2_us", "murray", "uk"]
 if PY3:
     __CODES.extend(["ita2_meteo", "mtk2"])
-__guess__    = ["baudot%s-{}-{}".format(a, b) for a in __CODES for b in ["lsb", "msb"]]
+__guess__    = ["baudot%s-{}-{}".format(x, y) for x in __CODES for y in ["lsb", "msb"]]
 __examples1__ = {
     'enc(baudot-BAD_ALPHABET)': None,
     'enc(baudot_ccitt2_lsb)':   {'TEST 1234': "00001100001010000001001001101111101110011000001010"},
 
@@ -6,10 +6,14 @@
 import codecs
 import codext
 import random
-from six import b, ensure_str
+import sys
+from six import b, binary_type, text_type
 from unittest import TestCase
 
 
+PY3 = sys.version[0] == "3"
+
+
 def dummy_encode(input, errors="strict"):
     return input, len(input)
 
@@ -18,6 +22,18 @@ def dummy_decode(input, errors="strict"):
     return input, len(input)
 
 
+def ensure_str(s, encoding='utf-8', errors='strict'):
+    """ Similar to six.ensure_str. Adapted here to avoid messing up with six version errors. """
+    if not PY3 and isinstance(s, text_type):
+        return s.encode(encoding, errors)
+    elif PY3 and isinstance(s, binary_type):
+        try:
+            return s.decode(encoding, errors)
+        except:
+            return s.decode("latin-1")
+    return s
+
+
 def getregentry(encoding):
     if encoding == "dummy3":
         return codecs.CodecInfo(name="dummy3", encode=dummy_encode, decode=dummy_decode)