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

Timestamp:

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

Author:

István Váradi <ivaradi@…>

Branch:

default

hg-Phase:

(<MercurialRepository 1 'hg:/home/ivaradi/mlx/hg' '/'>, 'public')

Message:

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

File:

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

src/mlx/fsuipc.py

@@ -104 +104 @@
             return fun()
         except Exception, e:
-            print >> sys.stderr, str(e)
+            print >> sys.stderr, util.utf2unicode(str(e))
             return None
 
@@ -386 +386 @@
                 return attempts
             except Exception, e:
-                print "fsuipc.Handler._connect: connection failed: " + str(e) + \
+                print "fsuipc.Handler._connect: connection failed: " + \
+                      util.utf2unicode(str(e)) + \
                       " (attempts: %d)" % (attempts,)
                 if attempts<self.NUM_CONNECTATTEMPTS:
@@ -446 +447 @@
             except Exception as e:
                 print "fsuipc.Handler._processRequest: FSUIPC connection failed (" + \
-                      str(e) + "), reconnecting (attempts=%d)." % (attempts,)
+                      util.utf2unicode(str(e)) + \
+                      "), reconnecting (attempts=%d)." % (attempts,)
                 needReconnect = True
 
@@ -895 +897 @@
 
         Return if a new model was created."""
+        name = self._latin1decoder(name)[0]
+        airPath = self._latin1decoder(airPath)[0]
+
         aircraftName = (name, airPath)
         if aircraftName==self._aircraftName:
@@ -912 +917 @@
 
         if needNew:
-            self._setAircraftModel(AircraftModel.create(self._aircraft, aircraftName))
-
-
-        self._aircraft.modelChanged(timestamp, self._latin1decoder(name)[0],
-                                    self._aircraftModel.name)
+            self._setAircraftModel(AircraftModel.create(self._aircraft,
+                                                        aircraftName))
+
+        self._aircraft.modelChanged(timestamp, name, self._aircraftModel.name)
 
         return needNew