diff options
| author | Claude Paroz <claude@2xlibre.net> | 2017-04-21 19:52:26 +0200 |
|---|---|---|
| committer | Claude Paroz <claude@2xlibre.net> | 2017-04-27 09:10:02 +0200 |
| commit | 301de774c21d055e9e5a7073e5bffdb52bc71079 (patch) | |
| tree | 4c0c65fd147d528cce920cbd6a16ffa493d832ca /django/shortcuts.py | |
| parent | 8ab7ce8558792f41637d6f87f2a8a117e169dd18 (diff) | |
Refs #27795 -- Replaced many force_text() with str()
Thanks Tim Graham for the review.
Diffstat (limited to 'django/shortcuts.py')
| -rw-r--r-- | django/shortcuts.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/django/shortcuts.py b/django/shortcuts.py index 0ce7ee327f..6fe3d2d590 100644 --- a/django/shortcuts.py +++ b/django/shortcuts.py @@ -11,7 +11,6 @@ from django.http import ( from django.template import loader from django.urls import NoReverseMatch, reverse from django.utils.deprecation import RemovedInDjango30Warning -from django.utils.encoding import force_text from django.utils.functional import Promise @@ -138,7 +137,7 @@ def resolve_url(to, *args, **kwargs): if isinstance(to, Promise): # Expand the lazy instance, as it can cause issues when it is passed # further to some Python functions like urlparse. - to = force_text(to) + to = str(to) if isinstance(to, str): # Handle relative URLs |
