flake8 fixes

This commit is contained in:
blitzmann
2017-05-08 21:27:25 -04:00
parent 42e64a6223
commit 3de63c5ca5
32 changed files with 86 additions and 41 deletions

View File

@@ -18,8 +18,7 @@
# ===============================================================================
from sqlalchemy import Column, String, Integer, Boolean, Table, ForeignKey
from sqlalchemy.ext.associationproxy import association_proxy
from sqlalchemy.orm import mapper, synonym, relation, deferred
from sqlalchemy.orm import mapper, synonym, deferred
from eos.db import gamedata_meta
from eos.gamedata import Effect, ItemEffect
@@ -45,4 +44,3 @@ mapper(Effect, effects_table,
})
mapper(ItemEffect, typeeffects_table)

View File

@@ -125,6 +125,7 @@ def getItems(lookfor, eager=None):
results.sort(key=lambda x: lookfor.index(x.ID))
return results
@cachedQuery(1, "lookfor")
def getAlphaClone(lookfor, eager=None):
if isinstance(lookfor, int):
@@ -359,6 +360,7 @@ def directAttributeRequest(itemIDs, attrIDs):
result = gamedata_session.execute(q).fetchall()
return result
def getRequiredFor(itemID, attrMapping):
Attribute1 = aliased(Attribute)
Attribute2 = aliased(Attribute)

View File

@@ -11,4 +11,3 @@ def upgrade(saveddata_engine):
saveddata_engine.execute("SELECT secStatus FROM characters LIMIT 1")
except sqlalchemy.exc.DatabaseError:
saveddata_engine.execute("ALTER TABLE characters ADD COLUMN secStatus FLOAT;")

View File

@@ -250,9 +250,9 @@ mapper(es_Fit, fits_table,
)
mapper(ProjectedFit, projectedFits_table,
properties={
"_ProjectedFit__amount": projectedFits_table.c.amount,
}
properties={
"_ProjectedFit__amount": projectedFits_table.c.amount,
}
)
mapper(CommandFit, commandFits_table)

View File

@@ -17,7 +17,7 @@
# along with eos. If not, see <http://www.gnu.org/licenses/>.
# ===============================================================================
from sqlalchemy import Table, Column, Integer, ForeignKey, CheckConstraint, Boolean, DateTime, select
from sqlalchemy import Table, Column, Integer, ForeignKey, CheckConstraint, Boolean, DateTime
from sqlalchemy.orm import relation, mapper
import datetime
@@ -40,6 +40,3 @@ modules_table = Table("modules", saveddata_meta,
mapper(Module, modules_table,
properties={"owner": relation(Fit)})