encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-27 08:29:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

more f-strings

Browse Source 
blah blah
This commit is contained in:
Jeremy Langley 2022-02-13 09:07:05 -08:00
parent 58b4089595
commit 0b49e13ace
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rest_framework/renderers.py
View File

@ -856,8 +856,8 @@ class DocumentationRenderer(BaseRenderer):
return { return {
'document': data, 'document': data,
'langs': self.languages, 'langs': self.languages,
'lang_htmls': ["rest_framework/docs/langs/%s.html" % language for language in self.languages], 'lang_htmls': [f"rest_framework/docs/langs/{language}.html" for language in self.languages],
'lang_intro_htmls': ["rest_framework/docs/langs/%s-intro.html" % language for language in self.languages], 'lang_intro_htmls': [f"rest_framework/docs/langs/{language}-intro.html" for language in self.languages],
'code_style': pygments_css(self.code_style), 'code_style': pygments_css(self.code_style),
'request': request 'request': request
} }

2
rest_framework/serializers.py
View File

@ -1375,7 +1375,7 @@ class ModelSerializer(Serializer):
if not isinstance(read_only_fields, (list, tuple)): if not isinstance(read_only_fields, (list, tuple)):
raise TypeError( raise TypeError(
'The `read_only_fields` option must be a list or tuple. ' 'The `read_only_fields` option must be a list or tuple. '
'Got %s.' % type(read_only_fields).__name__ f'Got {type(read_only_fields).__name__}.'
) )
for field_name in read_only_fields: for field_name in read_only_fields:
kwargs = extra_kwargs.get(field_name, {}) kwargs = extra_kwargs.get(field_name, {})

8
rest_framework/templatetags/rest_framework.py
View File

@ -194,7 +194,7 @@ def add_class(value, css_class):
return mark_safe(class_re.sub(match.group(1) + " " + css_class, return mark_safe(class_re.sub(match.group(1) + " " + css_class,
html)) html))
else: else:
return mark_safe(html.replace('>', ' class="%s">' % css_class, 1)) return mark_safe(html.replace('>', f' class="{css_class}">', 1))
return value return value
@ -202,7 +202,7 @@ def add_class(value, css_class):
def format_value(value): def format_value(value):
if getattr(value, 'is_hyperlink', False): if getattr(value, 'is_hyperlink', False):
name = str(value.obj) name = str(value.obj)
return mark_safe('<a href=%s>%s</a>' % (value, escape(name))) return mark_safe(f'<a href={value}>{escape(name)}</a>')
if value is None or isinstance(value, bool): if value is None or isinstance(value, bool):
return mark_safe('<code>%s</code>' % {True: 'true', False: 'false', None: 'null'}[value]) return mark_safe('<code>%s</code>' % {True: 'true', False: 'false', None: 'null'}[value])
elif isinstance(value, list): elif isinstance(value, list):
@ -218,8 +218,8 @@ def format_value(value):
return template.render(context) return template.render(context)
elif isinstance(value, str): elif isinstance(value, str):
if ( if (
(value.startswith('http:') or value.startswith('https:')) and not (value.startswith('http:') or value.startswith('https:')) and not
re.search(r'\s', value) re.search(r'\s', value)
): ):
return mark_safe('<a href="{value}">{value}</a>'.format(value=escape(value))) return mark_safe('<a href="{value}">{value}</a>'.format(value=escape(value)))
elif '@' in value and not re.search(r'\s', value): elif '@' in value and not re.search(r'\s', value):