From 73d9dd60e69363ffa6d9333e8992c66c49f8781d Mon Sep 17 00:00:00 2001
From: Ryan Holmes <holmes.ryan.90@gmail.com>
Date: Thu, 21 Sep 2017 21:13:05 -0400
Subject: [PATCH] Don't return None as a price, always return a float (#1291)
 (#1292)

---
 eos/db/saveddata/price.py |  6 ++++--
 eos/saveddata/price.py    | 10 +++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/eos/db/saveddata/price.py b/eos/db/saveddata/price.py
index 2135d20cf..8be7f6519 100644
--- a/eos/db/saveddata/price.py
+++ b/eos/db/saveddata/price.py
@@ -25,8 +25,10 @@ from eos.saveddata.price import Price
 
 prices_table = Table("prices", saveddata_meta,
                      Column("typeID", Integer, primary_key=True),
-                     Column("price", Float),
+                     Column("price", Float, default=0.0),
                      Column("time", Integer, nullable=False),
                      Column("failed", Integer))
 
-mapper(Price, prices_table)
+mapper(Price, prices_table, properties={
+    "_Price__price": prices_table.c.price,
+})
diff --git a/eos/saveddata/price.py b/eos/saveddata/price.py
index 304d6fedd..6618119d0 100644
--- a/eos/saveddata/price.py
+++ b/eos/saveddata/price.py
@@ -30,7 +30,7 @@ class Price(object):
     def __init__(self, typeID):
         self.typeID = typeID
         self.time = 0
-        self.price = 0
+        self.__price = 0
         self.failed = None
 
     @reconstructor
@@ -40,3 +40,11 @@ class Price(object):
     @property
     def isValid(self):
         return self.time >= time.time()
+
+    @property
+    def price(self):
+        return self.__price or 0.0
+
+    @price.setter
+    def price(self, price):
+        self.__price = price