diff --git a/config.py b/config.py index 550367f48..d70fee3fd 100644 --- a/config.py +++ b/config.py @@ -64,9 +64,11 @@ def getPyfaRoot(): root = unicode(root, sys.getfilesystemencoding()) return root + def getDefaultSave(): return unicode(os.path.expanduser(os.path.join("~", ".pyfa")), sys.getfilesystemencoding()) + def defPaths(customSavePath): global debug global pyfaPath @@ -133,7 +135,7 @@ def defPaths(customSavePath): # maintenance script gameDB = os.path.join(pyfaPath, "eve.db") - ## DON'T MODIFY ANYTHING BELOW ## + # DON'T MODIFY ANYTHING BELOW import eos.config # Caching modifiers, disable all gamedata caching, its unneeded. @@ -142,6 +144,7 @@ def defPaths(customSavePath): eos.config.saveddata_connectionstring = "sqlite:///" + saveDB + "?check_same_thread=False" eos.config.gamedata_connectionstring = "sqlite:///" + gameDB + "?check_same_thread=False" + # Keeping disabled code here for now until we can determine with decent certainty that this isn't needed ''' def getPyfaPath(Append=None): @@ -180,4 +183,4 @@ def parsePath(root, Append=None): path = path.decode('windows-1252') return path -''' \ No newline at end of file +''' diff --git a/gui/errorDialog.py b/gui/errorDialog.py index b9e70c851..469eb9e63 100644 --- a/gui/errorDialog.py +++ b/gui/errorDialog.py @@ -1,4 +1,4 @@ -#=============================================================================== +# =============================================================================== # Copyright (C) 2010 Diego Duclos # # This file is part of pyfa. @@ -15,23 +15,25 @@ # # You should have received a copy of the GNU General Public License # along with pyfa. If not, see . -#=============================================================================== +# =============================================================================== import wx import sys import gui.utils.fonts as fonts import config + class ErrorFrame(wx.Frame): def __init__(self, exception, tb): - wx.Frame.__init__(self, None, id=wx.ID_ANY, title="pyfa error", pos=wx.DefaultPosition, size=wx.Size(500, 400), style=wx.DEFAULT_FRAME_STYLE^ wx.RESIZE_BORDER|wx.STAY_ON_TOP) + wx.Frame.__init__(self, None, id=wx.ID_ANY, title="pyfa error", pos=wx.DefaultPosition, size=wx.Size(500, 400), + style=wx.DEFAULT_FRAME_STYLE ^ wx.RESIZE_BORDER | wx.STAY_ON_TOP) - desc = "pyfa has experienced an unexpected error. Below is the " \ - "Traceback that contains crucial information about how this " \ - "error was triggered. Please contact the developers with " \ - "the information provided through the EVE Online forums " \ - "or file a GitHub issue." + desc = "pyfa has experienced an unexpected error. Below is the " \ + "Traceback that contains crucial information about how this " \ + "error was triggered. Please contact the developers with " \ + "the information provided through the EVE Online forums " \ + "or file a GitHub issue." self.SetSizeHintsSz(wx.DefaultSize, wx.DefaultSize) @@ -50,7 +52,8 @@ class ErrorFrame(wx.Frame): mainSizer.Add(wx.StaticLine(self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL), 0, wx.EXPAND | wx.ALL, 5) descSizer = wx.BoxSizer(wx.HORIZONTAL) - self.descText = wx.TextCtrl(self, wx.ID_ANY, desc, wx.DefaultPosition, wx.DefaultSize, wx.TE_AUTO_URL|wx.TE_MULTILINE|wx.TE_READONLY|wx.BORDER_NONE|wx.TRANSPARENT_WINDOW ) + self.descText = wx.TextCtrl(self, wx.ID_ANY, desc, wx.DefaultPosition, wx.DefaultSize, + wx.TE_AUTO_URL | wx.TE_MULTILINE | wx.TE_READONLY | wx.BORDER_NONE | wx.TRANSPARENT_WINDOW) self.descText.SetFont(wx.Font(fonts.BIG, wx.SWISS, wx.NORMAL, wx.NORMAL)) descSizer.Add(self.descText, 1, wx.ALL, 5) mainSizer.Add(descSizer, 1, wx.EXPAND, 5) @@ -65,11 +68,11 @@ class ErrorFrame(wx.Frame): mainSizer.Add(self.eveForums, 0, wx.ALL, 2) - #mainSizer.AddSpacer((0, 5), 0, wx.EXPAND, 5) + # mainSizer.AddSpacer((0, 5), 0, wx.EXPAND, 5) - self.errorTextCtrl = wx.TextCtrl(self, wx.ID_ANY, "", wx.DefaultPosition, wx.DefaultSize, wx.TE_MULTILINE|wx.TE_READONLY|wx.TE_RICH2|wx.TE_DONTWRAP) + self.errorTextCtrl = wx.TextCtrl(self, wx.ID_ANY, "", wx.DefaultPosition, wx.DefaultSize, wx.TE_MULTILINE | wx.TE_READONLY | wx.TE_RICH2 | wx.TE_DONTWRAP) self.errorTextCtrl.SetFont(wx.Font(8, wx.FONTFAMILY_TELETYPE, wx.NORMAL, wx.NORMAL)) - mainSizer.Add(self.errorTextCtrl, 0, wx.EXPAND|wx.LEFT|wx.RIGHT, 5) + mainSizer.Add(self.errorTextCtrl, 0, wx.EXPAND | wx.LEFT | wx.RIGHT, 5) self.errorTextCtrl.AppendText("pyfa root: ") self.errorTextCtrl.AppendText(config.pyfaPath or "Unknown") @@ -88,4 +91,4 @@ class ErrorFrame(wx.Frame): self.Centre(wx.BOTH) - self.Show() \ No newline at end of file + self.Show() diff --git a/gui/graphFrame.py b/gui/graphFrame.py index 44ed641bf..ac8c4b90c 100644 --- a/gui/graphFrame.py +++ b/gui/graphFrame.py @@ -73,7 +73,7 @@ class GraphFrame(wx.Frame): except: cache_dir = os.path.expanduser(os.path.join("~", ".matplotlib")) - cache_file = path = os.path.join(cache_dir, 'fontList.cache') + cache_file = os.path.join(cache_dir, 'fontList.cache') if os.access(cache_dir, os.W_OK | os.X_OK) and os.path.isfile(cache_file): # remove matplotlib font cache, see #234 diff --git a/gui/utils/exportHtml.py b/gui/utils/exportHtml.py index 01a2f6e30..3c4de3a55 100644 --- a/gui/utils/exportHtml.py +++ b/gui/utils/exportHtml.py @@ -175,7 +175,7 @@ class exportHtmlThread(threading.Thread): count = 0 - #todo: logging for export exceptions + # todo: logging for export exceptions for group in categoryList: # init market group string to give ships something to attach to HTMLgroup = '' @@ -199,7 +199,7 @@ class exportHtmlThread(threading.Thread): dnaFit = Port.exportDna(getFit(fit[0])) HTMLgroup += '
  • ' + ship.name + ": " + \ fit[1] + '
  • \n' - except Exception, e: + except: continue finally: if self.callback: @@ -222,7 +222,7 @@ class exportHtmlThread(threading.Thread): print dnaFit HTMLship += '
  • ' + fit[ 1] + '
  • \n' - except Exception, e: + except: continue finally: if self.callback: @@ -274,7 +274,7 @@ class exportHtmlThread(threading.Thread): dnaFit = Port.exportDna(getFit(fit[0])) HTML += '' + ship.name + ': ' + \ fit[1] + '
    \n' - except Exception, e: + except: continue finally: if self.callback: