Changeset 928:3b16c095d166

Timestamp:

04/27/19 12:20:37 (6 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

Unicode handling changes (re #347).

Location:

src/mlx

Files:

• i18n.py (modified) (1 diff)
• pyuipc_sim.py (modified) (1 diff)
• rpc.py (modified) (1 diff)
• web.py (modified) (2 diffs)

src/mlx/i18n.py

@@ -51 +51 @@
     If not found, the fallback language is searched. If that is not found
     either, the key itself is returned within curly braces."""
-    return _translation.ugettext(key)
+    return _translation.gettext(key)
     
 #------------------------------------------------------------------------------

src/mlx/pyuipc_sim.py

@@ -606 +606 @@
             return int(self.zfw * 256.0 * const.KGSTOLB)
         elif offset==0x3c00:       # Path of the current AIR file
-            return self.airPath
+            return bytes(self.airPath, "iso-8859-1")
         elif offset==0x3d00:       # Name of the current aircraft
-            return self.aircraftName
+            return bytes(self.aircraftName, "iso-8859-1")
         elif offset==0x6202:       # PMDG 737NG switches
             return self.pmdg_737ng_switches

src/mlx/rpc.py

@@ -470 +470 @@
 
         md5 = hashlib.md5()
-        md5.update(password)
+        md5.update(password.encode("utf-8"))
         self._passwordHash = md5.hexdigest()
 

src/mlx/web.py

@@ -1014 +1014 @@
                 data = f.read(16384)
                 while data:
-                    parser.feed(data)
+                    parser.feed(str(data))
                     data = f.read(16384)
             finally:
@@ -1051 +1051 @@
             result = Result()
             result.metars = {}
-            for line in iter(f.readline, ""):
+            for line in f.readlines():
+                line = str(line, "iso-8859-1")
                 if len(line)>5 and line[4]==' ':
                     icao = line[0:4]