Removed redundant numbered parameters from str.format(). (560b4207) · Commits · Dom Sekotill / django

django/contrib/admin/helpers.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -178,7 +178,7 @@ class AdminReadonlyField(object):
		if not self.is_first:
		attrs["class"] = "inline"
		label = self.field['label']
		return format_html('<label{0}>{1}:</label>',
		return format_html('<label{}>{}:</label>',
		flatatt(attrs),
		capfirst(force_text(label)))

django/contrib/admin/templatetags/admin_list.py

+11 −11

Original line number	Diff line number	Diff line
		@@ -34,9 +34,9 @@ def paginator_number(cl, i):
		if i == DOT:
		return '... '
		elif i == cl.page_num:
		return format_html('<span class="this-page">{0}</span> ', i + 1)
		return format_html('<span class="this-page">{}</span> ', i + 1)
		else:
		return format_html('<a href="{0}"{1}>{2}</a> ',
		return format_html('<a href="{}"{}>{}</a> ',
		cl.get_query_string({PAGE_VAR: i}),
		mark_safe(' class="end"' if i == cl.paginator.num_pages - 1 else ''),
		i + 1)
		@@ -117,13 +117,13 @@ def result_headers(cl):
		# Not sortable
		yield {
		"text": text,
		"class_attrib": format_html(' class="column-{0}"', field_name),
		"class_attrib": format_html(' class="column-{}"', field_name),
		"sortable": False,
		}
		continue

		# OK, it is sortable if we got this far
		th_classes = ['sortable', 'column-{0}'.format(field_name)]
		th_classes = ['sortable', 'column-{}'.format(field_name)]
		order_type = ''
		new_order_type = 'asc'
		sort_priority = 0
		@@ -168,14 +168,14 @@ def result_headers(cl):
		"url_primary": cl.get_query_string({ORDER_VAR: '.'.join(o_list_primary)}),
		"url_remove": cl.get_query_string({ORDER_VAR: '.'.join(o_list_remove)}),
		"url_toggle": cl.get_query_string({ORDER_VAR: '.'.join(o_list_toggle)}),
		"class_attrib": format_html(' class="{0}"', ' '.join(th_classes)) if th_classes else '',
		"class_attrib": format_html(' class="{}"', ' '.join(th_classes)) if th_classes else '',
		}


		def _boolean_icon(field_val):
		icon_url = static('admin/img/icon-%s.gif' %
		{True: 'yes', False: 'no', None: 'unknown'}[field_val])
		return format_html('<img src="{0}" alt="{1}" />', icon_url, field_val)
		return format_html('<img src="{}" alt="{}" />', icon_url, field_val)


		def items_for_result(cl, result, form):
		@@ -249,15 +249,15 @@ def items_for_result(cl, result, form):
		value = result.serializable_value(attr)
		result_id = escapejs(value)
		link_or_text = format_html(
		'<a href="{0}"{1}>{2}</a>',
		'<a href="{}"{}>{}</a>',
		url,
		format_html(
		' onclick="opener.dismissRelatedLookupPopup(window, '
		''{0}'); return false;"', result_id
		''{}'); return false;"', result_id
		) if cl.is_popup else '',
		result_repr)

		yield format_html('<{0}{1}>{2}</{3}>',
		yield format_html('<{}{}>{}</{}>',
		table_tag,
		row_class,
		link_or_text,
		@@ -271,9 +271,9 @@ def items_for_result(cl, result, form):
		form[cl.model._meta.pk.name].is_hidden)):
		bf = form[field_name]
		result_repr = mark_safe(force_text(bf.errors) + force_text(bf))
		yield format_html('<td{0}>{1}</td>', row_class, result_repr)
		yield format_html('<td{}>{}</td>', row_class, result_repr)
		if form and not form[cl.model._meta.pk.name].is_hidden:
		yield format_html('<td>{0}</td>', force_text(form[cl.model._meta.pk.name]))
		yield format_html('<td>{}</td>', force_text(form[cl.model._meta.pk.name]))


		class ResultList(list):

django/contrib/admin/utils.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -142,7 +142,7 @@ def get_deleted_objects(objs, opts, user, admin_site, using):
		if not user.has_perm(p):
		perms_needed.add(opts.verbose_name)
		# Display a link to the admin page.
		return format_html('{0}: <a href="{1}">{2}</a>',
		return format_html('{}: <a href="{}">{}</a>',
		capfirst(opts.verbose_name),
		admin_url,
		obj)

django/contrib/admin/widgets.py

+4 −4

Original line number	Diff line number	Diff line
		@@ -87,7 +87,7 @@ class AdminSplitDateTime(forms.SplitDateTimeWidget):
		forms.MultiWidget.__init__(self, widgets, attrs)

		def format_output(self, rendered_widgets):
		return format_html('<p class="datetime">{0} {1}<br />{2} {3}</p>',
		return format_html('<p class="datetime">{} {}<br />{} {}</p>',
		_('Date:'), rendered_widgets[0],
		_('Time:'), rendered_widgets[1])

		@@ -95,9 +95,9 @@ class AdminSplitDateTime(forms.SplitDateTimeWidget):
		class AdminRadioFieldRenderer(RadioFieldRenderer):
		def render(self):
		"""Outputs a <ul> for this set of radio fields."""
		return format_html('<ul{0}>\n{1}\n</ul>',
		return format_html('<ul{}>\n{}\n</ul>',
		flatatt(self.attrs),
		format_html_join('\n', '<li>{0}</li>',
		format_html_join('\n', '<li>{}</li>',
		((force_text(w),) for w in self)))


		@@ -325,7 +325,7 @@ class AdminURLFieldWidget(forms.URLInput):
		value = force_text(self._format_value(value))
		final_attrs = {'href': smart_urlquote(value)}
		html = format_html(
		'<p class="url">{0} <a{1}>{2}</a><br />{3} {4}</p>',
		'<p class="url">{} <a{}>{}</a><br />{} {}</p>',
		_('Currently:'), flatatt(final_attrs), value,
		_('Change:'), html
		)

django/contrib/auth/forms.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -44,12 +44,12 @@ class ReadOnlyPasswordHashWidget(forms.Widget):
		"Invalid password format or unknown hashing algorithm."))
		else:
		summary = format_html_join('',
		"<strong>{0}</strong>: {1} ",
		"<strong>{}</strong>: {} ",
		((ugettext(key), value)
		for key, value in hasher.safe_summary(encoded).items())
		)

		return format_html("<div{0}>{1}</div>", flatatt(final_attrs), summary)
		return format_html("<div{}>{}</div>", flatatt(final_attrs), summary)


		class ReadOnlyPasswordHashField(forms.Field):