Merge remote-tracking branch 'origin/master'

biosustain · Jan 18, 2016 · c42c656 · c42c656
2 parents 4387bb3 + 9d3bbec
commit c42c656
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/flask_potion/manager.py b/flask_potion/manager.py
@@ -5,6 +5,7 @@
 from .instances import Pagination
 from .exceptions import ItemNotFound
 from .filters import FILTER_NAMES, FILTERS_BY_TYPE, filters_for_fields
+import decimal
 
 class Manager(object):
     """
@@ -98,7 +99,8 @@ def _get_field_from_python_type(python_type):
                 list: Array,
                 dict: Object,
                 datetime.date: Date,
-                datetime.datetime: DateTime
+                datetime.datetime: DateTime,
+                decimal.Decimal: Number,
             }[python_type]
         except KeyError:
             raise RuntimeError('No appropriate field class for "{}" type found'.format(python_type))
@@ -315,4 +317,4 @@ def read(self, id):
 
         if query is None:
             raise ItemNotFound(self.resource, id=id)
-        return self._query_filter_by_id(query, id)
+        return self._query_filter_by_id(query, id)