diff options
| author | Claude Paroz <claude@2xlibre.net> | 2016-09-02 20:17:15 +0200 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2016-09-03 13:46:41 +0200 |
| commit | 2ced2f785d5aca0354abf5841d5449b7a49509dc (patch) | |
| tree | 46ade22a7c8d9ccdbab4a7fcb25f702172352521 /django/db/models/fields/reverse_related.py | |
| parent | b1d6b0a7b121eec860b518b4903d7c8c74f7773b (diff) | |
| download | django-2ced2f785d5aca0354abf5841d5449b7a49509dc.tar.gz | |
Replaced smart_* by force_* calls whenever possible
The smart_* version should only be used when a lazy string should keep
its lazy status.
Diffstat (limited to 'django/db/models/fields/reverse_related.py')
| -rw-r--r-- | django/db/models/fields/reverse_related.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/fields/reverse_related.py b/django/db/models/fields/reverse_related.py index 1554261246..86e96ee133 100644 --- a/django/db/models/fields/reverse_related.py +++ b/django/db/models/fields/reverse_related.py @@ -15,7 +15,7 @@ import warnings from django.core import exceptions from django.utils.deprecation import RemovedInDjango20Warning -from django.utils.encoding import smart_text +from django.utils.encoding import force_text from django.utils.functional import cached_property from . import BLANK_CHOICE_DASH @@ -136,7 +136,7 @@ class ForeignObjectRel(object): initially for utilization by RelatedFieldListFilter. """ return (blank_choice if include_blank else []) + [ - (x._get_pk_val(), smart_text(x)) for x in self.related_model._default_manager.all() + (x._get_pk_val(), force_text(x)) for x in self.related_model._default_manager.all() ] def is_hidden(self): |