summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSimon Charette <charette.s@gmail.com>2015-11-25 12:31:23 -0500
committerSimon Charette <charette.s@gmail.com>2015-11-26 11:21:35 -0500
commitb4a1d545db19bb427af4043ce2c689dad856514f (patch)
tree3e5a60813e6ac434f2673563f2cb141a0b44fa9b /docs
parentf7e599ad25e52e8108a2bf6c17fb203b398ed986 (diff)
[1.9.x] Fixed #25807 -- Instructed the migration writer about lazy objects.
Thanks to Trac alias mrgaolei for the report, Baptiste for the confirmation and Tim for the review. Backport of cc2ca9c550fbf8fca8684b373a3c8e3618eea08e from master
Diffstat (limited to 'docs')
-rw-r--r--docs/releases/1.9.txt3
-rw-r--r--docs/topics/migrations.txt4
2 files changed, 5 insertions, 2 deletions
diff --git a/docs/releases/1.9.txt b/docs/releases/1.9.txt
index b167500c76..bf6f45b450 100644
--- a/docs/releases/1.9.txt
+++ b/docs/releases/1.9.txt
@@ -448,7 +448,8 @@ Migrations
:djadminopt:`migrate --fake-initial <--fake-initial>` to more easily detect
initial migrations.
-* Added support for serialization of ``functools.partial`` objects.
+* Added support for serialization of ``functools.partial`` and ``LazyObject``
+ instances.
* When supplying ``None`` as a value in :setting:`MIGRATION_MODULES`, Django
will consider the app an app without migrations.
diff --git a/docs/topics/migrations.txt b/docs/topics/migrations.txt
index 57b6c3216a..24236ec9da 100644
--- a/docs/topics/migrations.txt
+++ b/docs/topics/migrations.txt
@@ -659,6 +659,7 @@ Django can serialize the following:
- ``decimal.Decimal`` instances
- ``functools.partial`` instances which have serializable ``func``, ``args``,
and ``keywords`` values.
+- ``LazyObject`` instances which wrap a serializable value.
- Any Django field
- Any function or method reference (e.g. ``datetime.datetime.today``) (must be in module's top-level scope)
- Any class reference (must be in module's top-level scope)
@@ -666,7 +667,8 @@ Django can serialize the following:
.. versionchanged:: 1.9
- Serialization support for `functools.partial` was added.
+ Serialization support for ``functools.partial`` and ``LazyObject``
+ instances was added.
Django can serialize the following on Python 3 only: