Tweaks to DecimalField

1 files changed, 13 insertions, 12 deletions

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 5fb99a42..db7ceabb 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -521,20 +521,21 @@ class DecimalField(Field):
         return value
 
     def to_representation(self, value):
-        if isinstance(value, decimal.Decimal):
-            context = decimal.getcontext().copy()
-            context.prec = self.max_digits
-            quantized = value.quantize(
-                decimal.Decimal('.1') ** self.decimal_places,
-                context=context
-            )
-            if not self.coerce_to_string:
-                return quantized
-            return '{0:f}'.format(quantized)
+        if value in (None, ''):
+            return None
 
+        if not isinstance(value, decimal.Decimal):
+            value = decimal.Decimal(value)
+
+        context = decimal.getcontext().copy()
+        context.prec = self.max_digits
+        quantized = value.quantize(
+            decimal.Decimal('.1') ** self.decimal_places,
+            context=context
+        )
         if not self.coerce_to_string:
-            return value
-        return '%.*f' % (self.max_decimal_places, value)
+            return quantized
+        return '{0:f}'.format(quantized)
 
 
 # Date & time fields...