dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 17 Wiki Activity

Merge branch 'development' into feature/strictSkills

Browse Source 
Conflicts:
	eos/gamedata.py
This commit is contained in:
blitzmann
2017-04-26 19:42:29 -04:00
parent 86e6250a63 f7349316b4
commit 77b5e8afdc
5 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
eos/gamedata.py
View File

@@ -461,9 +461,10 @@ class Item(EqBase):
@property
def price(self):
# todo: use `from sqlalchemy import inspect` instead (need to verify it works in old and new OS X builds)
if self.__price is not None and getattr(self.__price, '_sa_instance_state', None):
pyfalog.debug("Price data for {} was deleted, resetting object".format(self.ID))
# todo: use `from sqlalchemy import inspect` instead (mac-deprecated doesn't have inspect(), was imp[lemented in 0.8)
if self.__price is not None and getattr(self.__price, '_sa_instance_state', None) and self.__price._sa_instance_state.deleted:
pyfalog.debug("Price data for {} was deleted (probably from a cache reset), resetting object".format(self.ID))
self.__price = None
if self.__price is None: