Tox fixes

This commit is contained in:
Ebag333
2017-02-05 15:39:07 -08:00
parent 603a8acdfc
commit be66ff1eec
35 changed files with 75 additions and 63 deletions

View File

@@ -88,7 +88,7 @@ class CharacterImportThread(threading.Thread):
skill.getAttribute("typeID"),
skill.getAttribute("level"),
)
char = sCharacter.new(name+" (EVEMon)")
char = sCharacter.new(name + " (EVEMon)")
sCharacter.apiUpdateCharSheet(char.ID, skills)
except Exception, e:
logger.error("Exception on character import:")

View File

@@ -34,14 +34,13 @@ from eos import db
from service.fit import Fit as svcFit
import wx
from service.market import Market
from eos.types import State, Slot, Module, Cargo, Ship, Drone, Implant, Booster, Citadel, Fighter, Fit
if 'wxMac' not in wx.PlatformInfo or ('wxMac' in wx.PlatformInfo and wx.VERSION >= (3, 0)):
from service.crest import Crest
from service.market import Market
logger = logging.getLogger("pyfa.service.port")
try:
@@ -65,7 +64,7 @@ INV_FLAG_FIGHTER = 158
class Port(object):
instance = None
@classmethod
def getInstance(cls):
if cls.instance is None:
@@ -685,7 +684,7 @@ class Port(object):
elif entityState == "Inactive":
d.amountActive = 0
f.drones.append(d)
elif droneItem.category.name == "Fighter": # EFT saves fighter as drones
elif droneItem.category.name == "Fighter": # EFT saves fighter as drones
ft = Fighter(droneItem)
ft.amount = int(droneAmount) if ft.amount <= ft.fighterSquadronMaxSize else ft.fighterSquadronMaxSize
f.fighters.append(ft)

View File

@@ -26,9 +26,6 @@ try:
from urllib.parse import quote
except ImportError: # pragma: no cover
from urllib import quote
import logging
import re
import config
logger = logging.getLogger("pycrest.eve")
cache_re = re.compile(r'max-age=([0-9]+)')