Merge branch 'master' into patch-2

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 = [

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

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):