Merge branch 'master' into bug/char_fixes

eos/saveddata/fit.py

@@ -707,7 +707,7 @@ class Fit(object):
                     value.boosted_fit.__resetDependentCalcs()
 
         if targetFit and type == CalcType.PROJECTED:
-            pyfalog.debug("Calculating projections from {0} to target {1}", repr(self), repr(targetFit))
+            pyfalog.debug(u"Calculating projections from {0} to target {1}", repr(self), repr(targetFit))
             projectionInfo = self.getProjectionInfo(targetFit.ID)
 
         # Start applying any command fits that we may have.

gui/builtinContextMenus/commandFits.py

@@ -46,7 +46,7 @@ class CommandFits(ContextMenu):
         return "Command Fits"
 
     def addFit(self, menu, fit, includeShip=False):
-        label = fit.name if not includeShip else "({}) {}".format(fit.ship.item.name, fit.name)
+        label = fit.name if not includeShip else u"({}) {}".format(fit.ship.item.name, fit.name)
         id = ContextMenu.nextID()
         self.fitMenuItemIds[id] = fit
         menuItem = wx.MenuItem(menu, id, label)

gui/builtinContextMenus/tabbedFits.py

@@ -43,7 +43,7 @@ class TabbedFits(ContextMenu):
                 continue
             fit = sFit.getFit(page.activeFitID, basic=True)
             id = ContextMenu.nextID()
-            mitem = wx.MenuItem(rootMenu, id, '{}: {}'.format(fit.ship.item.name, fit.name))
+            mitem = wx.MenuItem(rootMenu, id, u"{}: {}".format(fit.ship.item.name, fit.name))
             bindmenu.Bind(wx.EVT_MENU, self.handleSelection, mitem)
             self.fitLookup[id] = fit
             m.AppendItem(mitem)

gui/builtinViews/fittingView.py

@@ -314,7 +314,7 @@ class FittingView(d.Display):
         fit = sFit.getFit(self.getActiveFit(), basic=True)
 
         bitmap = BitmapLoader.getImage("race_%s_small" % fit.ship.item.race, "gui")
-        text = "%s: %s" % (fit.ship.item.name, fit.name)
+        text = u"%s: %s" % (fit.ship.item.name, fit.name)
 
         pageIndex = self.parent.GetPageIndex(self)
         if pageIndex is not None:

gui/graphFrame.py

@@ -248,8 +248,8 @@ class GraphFrame(wx.Frame):
                 self.subplot.plot(x, y)
                 legend.append(fit.name)
             except:
-                pyfalog.warning("Invalid values in '{0}'", fit.name)
-                self.SetStatusText("Invalid values in '%s'" % fit.name)
+                pyfalog.warning(u"Invalid values in '{0}'", fit.name)
+                self.SetStatusText(u"Invalid values in '%s'" % fit.name)
                 self.canvas.draw()
                 return
 

gui/mainFrame.py

@@ -411,7 +411,7 @@ class MainFrame(wx.Frame, IPortUser):
         """ Export active fit """
         sFit = Fit.getInstance()
         fit = sFit.getFit(self.getActiveFit())
-        defaultFile = "%s - %s.xml" % (fit.ship.item.name, fit.name) if fit else None
+        defaultFile = u"%s - %s.xml" % (fit.ship.item.name, fit.name) if fit else None
 
         dlg = wx.FileDialog(self, "Save Fitting As...",
                             wildcard="EVE XML fitting files (*.xml)|*.xml",

service/fit.py

@@ -141,7 +141,7 @@ class Fit(object):
         except ValueError:
             ship = es_Citadel(eos.db.getItem(shipID))
         fit = FitType(ship)
-        fit.name = name if name is not None else "New %s" % fit.ship.item.name
+        fit.name = name if name is not None else u"New %s" % fit.ship.item.name
         fit.damagePattern = self.pattern
         fit.targetResists = self.targetResists
         fit.character = self.character
@@ -1174,7 +1174,7 @@ class Fit(object):
 
     def recalc(self, fit):
         start_time = time()
-        pyfalog.info("=" * 10 + "recalc" + "=" * 10)
+        pyfalog.info(u"=" * 10 + u"recalc: {0}" + u"=" * 10, fit.name)
         if fit.factorReload is not self.serviceFittingOptions["useGlobalForceReload"]:
             fit.factorReload = self.serviceFittingOptions["useGlobalForceReload"]
         fit.clear()

service/port.py

@@ -1114,7 +1114,7 @@ class Port(object):
             also, it's OK to arrange modules randomly?
         """
         offineSuffix = " /OFFLINE"
-        export = "[%s, %s]\n" % (fit.ship.item.name, fit.name)
+        export = u"[%s, %s]\n" % (fit.ship.item.name, fit.name)
         stuff = {}
         sFit = svcFit.getInstance()
         for module in fit.modules: