From 79de112d627d9a84e302d54849e95dd7ab677a43 Mon Sep 17 00:00:00 2001 From: manelbdacosta <30473446+manelbdcosta@users.noreply.github.com> Date: Mon, 3 Oct 2022 10:36:51 +0100 Subject: [PATCH 1/3] Minor fix to SerializeMethodField docstring (#8629) --- rest_framework/fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework/fields.py b/rest_framework/fields.py index 6374c1ea9..a6924bf23 100644 --- a/rest_framework/fields.py +++ b/rest_framework/fields.py @@ -1814,7 +1814,7 @@ class SerializerMethodField(Field): For example: - class ExampleSerializer(self): + class ExampleSerializer(Serializer): extra_info = SerializerMethodField() def get_extra_info(self, obj): From ca75300ae9048c8c90d1e57935d22ec99ffbbac7 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Mon, 3 Oct 2022 11:39:32 +0100 Subject: [PATCH 2/3] Update requirements-testing.txt (#8680) * Update requirements-testing.txt * Update requirements-testing.txt --- requirements/requirements-testing.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/requirements-testing.txt b/requirements/requirements-testing.txt index 313fdedc9..f6823e2e2 100644 --- a/requirements/requirements-testing.txt +++ b/requirements/requirements-testing.txt @@ -2,3 +2,4 @@ pytest>=6.1,<7.0 pytest-cov>=2.10.1,<3.0 pytest-django>=4.1.0,<5.0 +importlib-metadata<5.0 From e7777cb1ee98c0215a5f1f082a88290eefa3e293 Mon Sep 17 00:00:00 2001 From: Sardorbek Imomaliev Date: Mon, 3 Oct 2022 15:48:18 +0500 Subject: [PATCH 3/3] Add spaces to router example in 6-viewsets-and-routers.md (#8448) --- docs/tutorial/6-viewsets-and-routers.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/tutorial/6-viewsets-and-routers.md b/docs/tutorial/6-viewsets-and-routers.md index e12becbd0..b7a7696a7 100644 --- a/docs/tutorial/6-viewsets-and-routers.md +++ b/docs/tutorial/6-viewsets-and-routers.md @@ -112,8 +112,8 @@ Here's our re-wired `snippets/urls.py` file. # Create a router and register our viewsets with it. router = DefaultRouter() - router.register(r'snippets', views.SnippetViewSet,basename="snippet") - router.register(r'users', views.UserViewSet,basename="user") + router.register(r'snippets', views.SnippetViewSet, basename='snippet') + router.register(r'users', views.UserViewSet, basename='user') # The API URLs are now determined automatically by the router. urlpatterns = [