Fix encoding for Py3 compatibility

[m_lib.git] / m_lib / opstring.py

diff --git a/m_lib/opstring.py b/m_lib/opstring.py
index 8bd864acb0f3de2c07bf5b3047854c16cfb66b8e..0341bced97cfc82d8992b5ce10794aba95682798 100755 (executable)
--- a/m_lib/opstring.py
+++ b/m_lib/opstring.py
@@ -126,10 +126,10 @@ def translate_a(val, id):
    return transl_adict[id][val]
 
 
-# Encodings, especially cyrillic. Requires Unicode, hence Python 2.0+
-
 def recode(s, from_encoding, to_encoding, errors = "strict"):
-   return unicode(s, from_encoding, errors).encode(to_encoding, errors)
+   if isinstance(s, bytes):
+      s = s.decode(from_encoding, errors)
+   return s.encode(to_encoding, errors)
 
 
 def win2koi(s, errors = "strict"):