1 files changed, 8 insertions, 3 deletions
diff --git a/django/db/migrations/writer.py b/django/db/migrations/writer.py
index f6f01d943f..53ec414335 100644
--- a/django/db/migrations/writer.py
+++ b/django/db/migrations/writer.py
@@ -1,10 +1,11 @@
 from __future__ import unicode_literals
 
+import collections
 import datetime
-import inspect
 import decimal
-import collections
 from importlib import import_module
+import inspect
+import math
 import os
 import re
 import sys
@@ -303,7 +304,11 @@ class MigrationWriter(object):
         elif isinstance(value, SettingsReference):
             return "settings.%s" % value.setting_name, set(["from django.conf import settings"])
         # Simple types
-        elif isinstance(value, six.integer_types + (float, bool, type(None))):
+        elif isinstance(value, float):
+            if math.isnan(value) or math.isinf(value):
+                return 'float("{}")'.format(value), set()
+            return repr(value), set()
+        elif isinstance(value, six.integer_types + (bool, type(None))):
             return repr(value), set()
         elif isinstance(value, six.binary_type):
             value_repr = repr(value)