Merged kfsone/tradedangerous into master

eyeonus · Jul 25, 2015 · 803b207 · 803b207
2 parents 02588bd + f6e4298
commit 803b207
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -2,6 +2,9 @@
 TradeDangerous, Copyright (C) Oliver "kfsone" Smith, July 2014
 ==============================================================================
 
+v7.3.1 Jul 21 2015:
+. (kfsone) Fix for edapi.
+
 Jul 07 2015:
 . (kfsone) Fixed division by zero in transfers.py with empty file
 

diff --git a/plugins/edapi_plug.py b/plugins/edapi_plug.py
@@ -604,15 +604,15 @@ def run(self):
                 f.write("\t+ {}\n".format(commodity['categoryname']))
 
                 # If stock is zero, list it as unavailable.
-                if commodity['stock'] == 0:
+                if commodity['stock'] or 0 == 0:
                     commodity['stock'] = '-'
                 else:
                     demand = bracket_levels[int(commodity['stockBracket'])]
                     commodity['stock'] = str(int(commodity['stock']))+demand
 
                 # If demand is zero, zero out the sell price.
                 if (commodity['demand'] == 0 or
-                    commodity['demandBracket'] == 0
+                    commodity['demandBracket'] or 0 == 0
                    ):
                     commodity['demand'] = '?'
                     commodity['sellPrice'] = 0