- more python3 fixes, dropped python2 support

[tld-builder.git] / TLD_Builder / util.py

diff --git a/TLD_Builder/util.py b/TLD_Builder/util.py
index 05cf076753ee6ec6ce8ccc4804bbf4f6b01c256c..1d485a170c20378fab39a6ad092f1fd04a5dc1ee 100644 (file)
--- a/TLD_Builder/util.py
+++ b/TLD_Builder/util.py
@@ -5,6 +5,7 @@ import sys
 import os
 import log
 import string
+import codecs
 
 def uuid_python():
     return str(uuid_random())
@@ -95,3 +96,19 @@ def cmp_to_key(mycmp):
         def __ne__(self, other):
             return mycmp(self.obj, other.obj) != 0
     return K
+
+def to_bytes(s):
+    if type(s) is bytes:
+        return s
+    elif type(s) is str or (sys.version_info[0] < 3 and type(s) is unicode):
+        return codecs.encode(s, 'utf-8')
+    else:
+        raise TypeError("Expected bytes or string, but got %s." % type(s))
+
+def to_str(s):
+    if type(s) is bytes:
+        return codecs.decode(s, 'utf-8')
+    elif type(s) is str or (sys.version_info[0] < 3 and type(s) is unicode):
+        return s
+    else:
+        raise TypeError("Expected bytes or string, but got %s." % type(s))