Merge branch 'master' into ammo_graph

service/marketSources/__init__.py

@@ -1 +1 @@
-__all__ = ['evemarketer', 'evemarketdata', 'evepraisal']
+__all__ = ['evemarketer', 'evepraisal', 'evemarketdata']

service/marketSources/evepraisal.py

@@ -66,11 +66,15 @@ class EvePraisal:
             try:
                 typeID = int(itemData['typeID'])
                 price = itemData['prices']['sell']['min']
+                orderCount = itemData['prices']['sell']['order_count']
             except (KeyError, TypeError):
                 continue
             # evepraisal returns 0 if price data doesn't even exist for the item
             if price == 0:
                 continue
+            # evepraisal seems to provide price for some items despite having no orders up
+            if orderCount < 1:
+                continue
             priceMap[typeID].update(PriceStatus.fetchSuccess, price)
             del priceMap[typeID]
 

service/port/esi.py

@@ -18,8 +18,8 @@
 # =============================================================================
 
 
-import collections
 import json
+from collections import defaultdict
 
 from logbook import Logger
 
@@ -61,7 +61,7 @@ def exportESI(ofit, callback):
     # max fit name length is 50 characters
     # Most keys are created simply because they are required, but bogus data is okay
 
-    nested_dict = lambda: collections.defaultdict(nested_dict)
+    nested_dict = lambda: defaultdict(nested_dict)
     fit = nested_dict()
     sFit = svcFit.getInstance()