Changeset 96:eef8ca34bc9e in xplra

Timestamp:

05/19/19 11:18:03 (6 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The Python client module works with both Python 2 and 3

File:

• src/client/python/xplra.py (modified) (4 diffs)

src/client/python/xplra.py

@@ -5 +5 @@
 import struct
 import array
+import sys
+
+isPy3 = sys.version_info[0] >= 3
 
 #-------------------------------------------------------------------------------
@@ -274 +277 @@
     def _packLength(x):
         """Pack the given integer as a variable-length value."""
-        s = ""
+        s = bytes() if isPy3 else ""
         while True:
             y = x&0x7f
@@ -286 +289 @@
     def _packString(s):
         """Pack the given string."""
-        return XPlane._packLength(len(s)) + s
+        return XPlane._packLength(len(s)) + (bytes(s, "utf-8") if isPy3 else s)
 
     def __init__(self):
@@ -305 +308 @@
             s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
             s.connect("/tmp/xplra-" + os.environ["LOGNAME"])
-            self._stream = s.makefile()
+            self._stream = s.makefile("rwb")
 
         for multiBuffer in self._multiBuffers: