Changeset 401:15ad3c16ee11 for src/mlx/update.py

Timestamp:

12/27/12 08:04:59 (11 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The exception strings are converted from UTF-8 to unicode for proper logging (re #170)

File:

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

src/mlx/update.py

@@ -1 +1 @@
 
 from config import Config
+from util import utf2unicode
 
 import os
@@ -206 +207 @@
             manifest.readFrom(f)
     except Exception, e:
-        print "Error reading the manifest, ignoring:", str(e)
+        print "Error reading the manifest, ignoring:", utf2unicode(str(e))
         manifest = Manifest()
 
@@ -228 +229 @@
 
     except Exception, e:
-        print >> sys.stderr, "Error downloading manifest:", str(e)
-        listener.failed(str(e))
+        error = utf2unicode(str(e))
+        print >> sys.stderr, "Error downloading manifest:", error
+        listener.failed(error)
         return None
     finally:
@@ -291 +293 @@
             os.rename(path, os.path.join(toremoveDir, sum.hexdigest()))
         except Exception, e:
-            print "Cannot remove file " + path + ": " + str(e)    
+            print "Cannot remove file " + path + ": " + utf2unicode(str(e))
 
 #------------------------------------------------------------------------------
@@ -370 +372 @@
         listener.done()
     except Exception, e:
-        print >> sys.stderr, "Error:", str(e)
-        listener.failed(str(e))        
+        error = utf2unicode(str(e))
+        print >> sys.stderr, "Error:", error
+        listener.failed(error)
 
 #------------------------------------------------------------------------------
@@ -432 +435 @@
         except Exception, e:
             print >> sys.stderr, "Failed to parse line '%s': %s" % \
-                  (line, str(e))                
+                  (line, utf2unicode(str(e)))
 
     return buffer
@@ -488 +491 @@
         
     except Exception, e:
-        print >> sys.stderr, "Failed updating:", str(e)
-        listener.failed(str(e))
+        error = utf2unicode(str(e))
+        print >> sys.stderr, "Failed updating:", error
+        listener.failed(error)
     finally:
         if serverSocket is not None: