Skip to content

Commit

Permalink
Tox fixes, because it's a thing we do now
Browse files Browse the repository at this point in the history
  • Loading branch information
blitzmann committed Feb 17, 2017
1 parent 66d78fe commit 4ba11d8
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
1 change: 1 addition & 0 deletions eos/db/migrations/upgrade21.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
(we don't support activating only 2/5 drones). See GH issue #728
"""


def upgrade(saveddata_engine):
saveddata_engine.execute("UPDATE drones SET amountActive = amount where amountActive > 0 AND amountActive <> amount;")
2 changes: 1 addition & 1 deletion eos/saveddata/character.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ def name(self):

if self.alphaCloneID:
clone = eos.db.getAlphaClone(self.alphaCloneID)
type = clone.alphaCloneName.split()[1]
type = clone.alphaCloneName.split()[1]
name += u' (\u03B1{})'.format(type[0].upper())

return name
Expand Down
4 changes: 1 addition & 3 deletions gui/contextMenu.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ def getBitmap(self, context, selection):
# noinspection PyUnresolvedReferences
from gui.builtinContextMenus import ( # noqa: E402,F401
openFit,
#moduleGlobalAmmoPicker,
# moduleGlobalAmmoPicker,
moduleAmmoPicker,
itemStats,
damagePattern,
Expand All @@ -204,5 +204,3 @@ def getBitmap(self, context, selection):
implantSets,
fighterAbilities,
)


2 changes: 1 addition & 1 deletion service/fit.py
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ def mergeDrones(self, fitID, d1, d2, projected=False):

# If we have less than the total number of drones active, make them all active. Fixes #728
# This could be removed if we ever add an enhancement to make drone stacks partially active.
if d2.amount > d2.amountActive:
if d2.amount > d2.amountActive:
d2.amountActive = d2.amount

eos.db.commit()
Expand Down

0 comments on commit 4ba11d8

Please sign in to comment.