From d5461e93fea2367fb0a5c7ef28d49c6be150273c Mon Sep 17 00:00:00 2001 From: David Smith <39445562+smithdc1@users.noreply.github.com> Date: Sat, 5 Sep 2020 09:02:27 +0100 Subject: [PATCH] Bump flake8 to 3.8.3 (#7521) --- requirements/requirements-codestyle.txt | 4 ++-- rest_framework/renderers.py | 4 ++-- rest_framework/utils/field_mapping.py | 1 - tests/test_fields.py | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/requirements/requirements-codestyle.txt b/requirements/requirements-codestyle.txt index 434fc41af..4f54d6e77 100644 --- a/requirements/requirements-codestyle.txt +++ b/requirements/requirements-codestyle.txt @@ -1,7 +1,7 @@ # PEP8 code linting, which we run on all commits. -flake8==3.7.9 +flake8==3.8.3 flake8-tidy-imports==4.1.0 -pycodestyle==2.5.0 +pycodestyle==2.6.0 # Sort and lint imports isort==5.4.2 diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index a96fa6e65..c790879b9 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -856,8 +856,8 @@ class DocumentationRenderer(BaseRenderer): return { 'document': data, 'langs': self.languages, - 'lang_htmls': ["rest_framework/docs/langs/%s.html" % l for l in self.languages], - 'lang_intro_htmls': ["rest_framework/docs/langs/%s-intro.html" % l for l in self.languages], + 'lang_htmls': ["rest_framework/docs/langs/%s.html" % language for language in self.languages], + 'lang_intro_htmls': ["rest_framework/docs/langs/%s-intro.html" % language for language in self.languages], 'code_style': pygments_css(self.code_style), 'request': request } diff --git a/rest_framework/utils/field_mapping.py b/rest_framework/utils/field_mapping.py index c008495cc..4f8a4f192 100644 --- a/rest_framework/utils/field_mapping.py +++ b/rest_framework/utils/field_mapping.py @@ -58,7 +58,6 @@ def get_detail_view_name(model): that refer to instances of the model. """ return '%(model_name)s-detail' % { - 'app_label': model._meta.app_label, 'model_name': model._meta.object_name.lower() } diff --git a/tests/test_fields.py b/tests/test_fields.py index b1ad1dc66..506e75905 100644 --- a/tests/test_fields.py +++ b/tests/test_fields.py @@ -669,7 +669,7 @@ class TestBooleanField(FieldValues): for input_value in inputs: with pytest.raises(serializers.ValidationError) as exc_info: field.run_validation(input_value) - expected = ['Must be a valid boolean.'.format(input_value)] + expected = ['Must be a valid boolean.'] assert exc_info.value.detail == expected