summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-04-23 13:15:45 -0400
committerTim Graham <timograham@gmail.com>2016-04-23 13:15:45 -0400
commit859eeaa0f0b04c2644237ff04e6632b2f40475cb (patch)
treef0db3c0bf0d872d40bfea60cd83fbb8c71fc4518 /django
parent669c29c8f4986def15cc4ee38b27299d32d5009f (diff)
Fixed #26533 -- Renamed Widget._format_value() to format_value().
Diffstat (limited to 'django')
-rw-r--r--django/contrib/admin/widgets.py2
-rw-r--r--django/forms/widgets.py17
2 files changed, 14 insertions, 5 deletions
diff --git a/django/contrib/admin/widgets.py b/django/contrib/admin/widgets.py
index 095be4433d..8967200318 100644
--- a/django/contrib/admin/widgets.py
+++ b/django/contrib/admin/widgets.py
@@ -376,7 +376,7 @@ class AdminURLFieldWidget(forms.URLInput):
def render(self, name, value, attrs=None):
html = super(AdminURLFieldWidget, self).render(name, value, attrs)
if value:
- value = force_text(self._format_value(value))
+ value = force_text(self.format_value(value))
final_attrs = {'href': smart_urlquote(value)}
html = format_html(
'<p class="url">{} <a{}>{}</a><br />{} {}</p>',
diff --git a/django/forms/widgets.py b/django/forms/widgets.py
index 4ec2cce075..68abd3b7dc 100644
--- a/django/forms/widgets.py
+++ b/django/forms/widgets.py
@@ -15,6 +15,9 @@ from django.templatetags.static import static
from django.utils import datetime_safe, formats, six
from django.utils.datastructures import MultiValueDict
from django.utils.dates import MONTHS
+from django.utils.deprecation import (
+ RemovedInDjango20Warning, RenameMethodsBase,
+)
from django.utils.encoding import (
force_str, force_text, python_2_unicode_compatible,
)
@@ -174,7 +177,13 @@ class SubWidget(object):
return self.parent_widget.render(*args)
-class Widget(six.with_metaclass(MediaDefiningClass)):
+class RenameWidgetMethods(MediaDefiningClass, RenameMethodsBase):
+ renamed_methods = (
+ ('_format_value', 'format_value', RemovedInDjango20Warning),
+ )
+
+
+class Widget(six.with_metaclass(RenameWidgetMethods)):
needs_multipart_form = False # Determines does this widget need multipart form
is_localized = False
is_required = False
@@ -248,7 +257,7 @@ class Input(Widget):
"""
input_type = None # Subclasses must define this.
- def _format_value(self, value):
+ def format_value(self, value):
if self.is_localized:
return formats.localize_input(value)
return value
@@ -259,7 +268,7 @@ class Input(Widget):
final_attrs = self.build_attrs(attrs, type=self.input_type, name=name)
if value != '':
# Only add the 'value' attribute if a value is non-empty.
- final_attrs['value'] = force_text(self._format_value(value))
+ final_attrs['value'] = force_text(self.format_value(value))
return format_html('<input{} />', flatatt(final_attrs))
@@ -443,7 +452,7 @@ class DateTimeBaseInput(TextInput):
super(DateTimeBaseInput, self).__init__(attrs)
self.format = format if format else None
- def _format_value(self, value):
+ def format_value(self, value):
return formats.localize_input(value, self.format or formats.get_format(self.format_key)[0])