diff --git a/django/forms/widgets.py b/django/forms/widgets.py
index ee8ab5c129..a16b554385 100644
--- a/django/forms/widgets.py
+++ b/django/forms/widgets.py
@@ -601,13 +601,17 @@ class ChoiceInput(SubWidget):
label_for = format_html(' for="{0}"', self.id_for_label)
else:
label_for = ''
- return format_html('', label_for, self.tag(), self.choice_label)
+ attrs = dict(self.attrs, **attrs) if attrs else self.attrs
+ return format_html(
+ '', label_for, self.tag(attrs), self.choice_label
+ )
def is_checked(self):
return self.value == self.choice_value
- def tag(self):
- final_attrs = dict(self.attrs, type=self.input_type, name=self.name, value=self.choice_value)
+ def tag(self, attrs=None):
+ attrs = attrs or self.attrs
+ final_attrs = dict(attrs, type=self.input_type, name=self.name, value=self.choice_value)
if self.is_checked():
final_attrs['checked'] = 'checked'
return format_html('', flatatt(final_attrs))
diff --git a/tests/forms_tests/tests/test_widgets.py b/tests/forms_tests/tests/test_widgets.py
index ccd5316d16..1f19e98389 100644
--- a/tests/forms_tests/tests/test_widgets.py
+++ b/tests/forms_tests/tests/test_widgets.py
@@ -687,6 +687,12 @@ beatle J R Ringo False""")
self.assertFalse(r[1].is_checked())
self.assertEqual((r[1].name, r[1].value, r[1].choice_value, r[1].choice_label), ('beatle', 'J', 'P', 'Paul'))
+ # These individual widgets can accept extra attributes if manually rendered.
+ self.assertHTMLEqual(
+ r[1].render(attrs={'extra': 'value'}),
+ ''
+ )
+
with self.assertRaises(IndexError):
r[10]