Changeset 401:15ad3c16ee11 for src/mlx/gui

Timestamp:

12/27/12 08:04:59 (12 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)

Location:

src/mlx/gui

Files:

• common.py (modified) (6 diffs)
• flight.py (modified) (2 diffs)

src/mlx/gui/common.py

@@ -96 +96 @@
         """Convert the given text, returned by xstr to a string."""
         return str(text)
+
 else:
     print "Using PyGObject"
@@ -106 +107 @@
     from gi.repository import Pango as pango
     appIndicator = True
-    
+
     MESSAGETYPE_ERROR = gtk.MessageType.ERROR
     MESSAGETYPE_QUESTION = gtk.MessageType.QUESTION
@@ -156 +157 @@
     import codecs
     _utf8Decoder = codecs.getdecoder("utf-8")
-    
+
     def text2unicode(str):
         """Convert the given text, returned by a Gtk widget, to Unicode."""
@@ -182 +183 @@
         self._noGoReason = None
         self._updateFlightStatus()
-        
+
     def setStage(self, stage):
         """Set the stage of the flight."""
@@ -233 +234 @@
             self.emit("integer-changed", self._currentInteger)
         self._set_text()
-    
+
     def _handle_changed(self, widget):
         """Handle the changed signal."""
@@ -253 +254 @@
                       else str(self._currentInteger))
         self._selfSetting = False
-                
+
 #------------------------------------------------------------------------------
 

src/mlx/gui/flight.py

@@ -512 +512 @@
                     flight.writeIntoFile(f)
             except Exception, e:
-                print "Failed to save flight:", str(e)
+                print "Failed to save flight:", util.utf2unicode(str(e))
                 dialog = gtk.MessageDialog(parent = self._wizard.gui.mainWindow,
                                            type = MESSAGETYPE_ERROR,
@@ -555 +555 @@
                 self._addFlight(bookedFlight)
             except Exception, e:
-                print "Failed to load flight:", str(e)
+                print "Failed to load flight:", util.utf2unicode(str(e))
                 dialog = gtk.MessageDialog(parent = self._wizard.gui.mainWindow,
                                            type = MESSAGETYPE_ERROR,