Merge branch 'master' into fit_export_options

service/marketSources/evemarketer.py

@@ -28,7 +28,7 @@ from service.price import Price, VALIDITY
 pyfalog = Logger(__name__)
 
 
-class EveCentral(object):
+class EveMarketer(object):
 
     name = "evemarketer"
 
@@ -67,4 +67,4 @@ class EveCentral(object):
             del priceMap[typeID]
 
 
-Price.register(EveCentral)
+Price.register(EveMarketer)

service/price.py

@@ -167,15 +167,16 @@ class Price(object):
         sMkt = Market.getInstance()
         item = sMkt.getItem(objitem)
 
-        return item.price.price
+        return item.price
 
     def getPrices(self, objitems, callback, waitforthread=False):
         """Get prices for multiple typeIDs"""
         requests = []
         sMkt = Market.getInstance()
         for objitem in objitems:
-            item = sMkt.getItem(objitem)
-            requests.append(item.price)
+            priceobj = sMkt.getItem(objitem).priceObj
+            if priceobj:
+                requests.append(priceobj)
 
         def cb():
             try:
@@ -197,6 +198,7 @@ class Price(object):
 
 
 class PriceWorkerThread(threading.Thread):
+
     def __init__(self):
         threading.Thread.__init__(self)
         self.name = "PriceWorker"