Version 3.0.0b2 - better Python 3 compatibility

[m_lib.git] / m_lib / rus / lat2rus.py

diff --git a/m_lib/rus/lat2rus.py b/m_lib/rus/lat2rus.py
index abf8af3823708ec56a391b81488942a7dbd607e6..16d82f114d2982ba06f430bb8010a4f44fd08e34 100755 (executable)
--- a/m_lib/rus/lat2rus.py
+++ b/m_lib/rus/lat2rus.py
@@ -1,9 +1,10 @@
 #! /usr/bin/env python
 # -*- coding: koi8-r -*-
 
 #! /usr/bin/env python
 # -*- coding: koi8-r -*-
 

+from __future__ import print_function
+

 #
 # Lat -> Rus translation
 #
 # Lat -> Rus translation

-# Written by Broytman. Copyright (C) 2002 PhiloSoft Design

 #
 
 lat2koi_d = {
 #
 
 lat2koi_d = {


@@ -80,27 +81,32 @@ lat2koi_d = {
    "%": ":",
    "^": ",",
    "&": ".",
    "%": ":",
    "^": ",",
    "&": ".",

-   "*": ";"
+   "*": ";",

 }
 
 
 def make_lat2xxx(encoding="cp1251"):
    d = {}
    for k, v in lat2koi_d.items():
 }
 
 
 def make_lat2xxx(encoding="cp1251"):
    d = {}
    for k, v in lat2koi_d.items():

-      v = unicode(v, "koi8-r").encode(encoding)
+      if isinstance(v, bytes):
+         v = v.decode("koi8-r")
+      v = v.encode(encoding)

       d[k] = v
    return d
 
 
       d[k] = v
    return d
 
 

-from m_lib.lazy.dict import LazyDictInitFunc
+from ..lazy.dict import LazyDictInitFunc

 lat2win_d = LazyDictInitFunc(make_lat2xxx, encoding="cp1251")
 
 
 def lat2rus(instr, lat2rus_d = lat2koi_d):
    out = []
    for c in instr:
 lat2win_d = LazyDictInitFunc(make_lat2xxx, encoding="cp1251")
 
 
 def lat2rus(instr, lat2rus_d = lat2koi_d):
    out = []
    for c in instr:

-      out.append(lat2rus_d.get(c, c))
-   return ''.join(out)
+      c = lat2rus_d.get(c, c)
+      if isinstance(c, bytes):
+         c = c.decode('koi8-r')
+      out.append(c.encode('koi8-r'))
+   return b''.join(out)

 
 
 lat2koi = lat2rus
 
 
 lat2koi = lat2rus


@@ -111,6 +117,9 @@ def lat2win(instr):
 
 if __name__ == "__main__":
    Test = "Ghbdtn nt,t^ ghtrhfcysq vbh!"
 
 if __name__ == "__main__":
    Test = "Ghbdtn nt,t^ ghtrhfcysq vbh!"

-   print "Test:", Test
-   print "����:", lat2koi(Test)
-   print "����:", unicode(lat2win(Test), "cp1251").encode("koi8-r")
+   print("Test:", Test)
+   print("����:", lat2koi(Test))
+   test = lat2win(Test)
+   if isinstance(test, bytes):
+      test = test.decode("cp1251")
+   print("����:", test.encode("koi8-r"))