Changeset 948:483488585dd8 for src/mlx

Timestamp:

05/07/19 18:31:40 (6 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

Encoding handling is fixed during update (re #347).

File:

• src/mlx/update.py (modified) (5 diffs)

src/mlx/update.py

@@ -11 +11 @@
 import hashlib
 import traceback
+import io
 
 if os.name=="nt":
@@ -195 +196 @@
     def _send(self, words):
         """Send the given words via the socket."""
-        self._sock.send("\t".join(words) + "\n")
+        self._sock.send(bytes("\t".join(words) + "\n", "utf-8"))
 
 #------------------------------------------------------------------------------
@@ -226 +227 @@
     try:
         updateManifest = Manifest()
-        f= urllib.request.urlopen(updateURL + "/" + manifestName)
-        updateManifest.readFrom(f)
+        reply = urllib.request.urlopen(updateURL + "/" + manifestName)
+        charset = reply.headers.get_content_charset()
+        content = reply.read().decode("utf-8" if charset is None else charset)
+        updateManifest.readFrom(io.StringIO(content))
 
     except Exception as e:
@@ -290 +293 @@
         try:
             sum = hashlib.md5()
-            sum.update(path)
+            sum.update(bytes(path, "utf-8"))
             toremoveDir = getToremoveDir(toremoveDir, directory)
             targetPath = os.path.join(toremoveDir, sum.hexdigest())
@@ -505 +508 @@
                 break;
 
-            buffer += data
+            buffer += str(data, "utf-8")
             buffer = processMLXUpdate(buffer, listener)