diff options
| author | Loic Bistuer <loic.bistuer@sixmedia.com> | 2013-09-01 02:11:37 +0700 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-08-31 20:26:44 -0400 |
| commit | ff9e1161984f43f34f9ecff5ee80959016447cf3 (patch) | |
| tree | e331ba372c91c7f0150956084bd117270679fed0 /django | |
| parent | 1c0c879be3a21affec3d5eb2d6b6e4f0a0803aec (diff) | |
Fixed #21008 -- Made MigrationWriter handle Promise objects.
Diffstat (limited to 'django')
| -rw-r--r-- | django/db/migrations/writer.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/django/db/migrations/writer.py b/django/db/migrations/writer.py index 75a44a8b95..e23f15dd77 100644 --- a/django/db/migrations/writer.py +++ b/django/db/migrations/writer.py @@ -7,6 +7,8 @@ from django.utils import six from django.db import models from django.db.models.loading import cache from django.db.migrations.loader import MigrationLoader +from django.utils.encoding import force_text +from django.utils.functional import Promise class MigrationWriter(object): @@ -111,6 +113,9 @@ class MigrationWriter(object): # Simple types elif isinstance(value, six.integer_types + (float, six.binary_type, six.text_type, bool, type(None))): return repr(value), set() + # Promise + elif isinstance(value, Promise): + return repr(force_text(value)), set() # Django fields elif isinstance(value, models.Field): attr_name, path, args, kwargs = value.deconstruct() |
