Merge branch 'master' into pyup-update-flake8-6.1.0-to-7.0.0

README.md

@@ -38,10 +38,10 @@ It is not needed to add this library in your Django project's `settings.py` file
 
 The desired URL signatures are:
 ```
-/domain/ <- Domains list
-/domain/{pk}/ <- One domain, from {pk}
-/domain/{domain_pk}/nameservers/ <- Nameservers of domain from {domain_pk}
-/domain/{domain_pk}/nameservers/{pk} <- Specific nameserver from {pk}, of domain from {domain_pk}
+/domains/ <- Domains list
+/domains/{pk}/ <- One domain, from {pk}
+/domains/{domain_pk}/nameservers/ <- Nameservers of domain from {domain_pk}
+/domains/{domain_pk}/nameservers/{pk} <- Specific nameserver from {pk}, of domain from {domain_pk}
 ```
 
 How to do it (example):

docs/index.md

@@ -1,6 +1,6 @@
 <div class="badges">
- <a href="http://travis-ci.org/alanjds/drf-nested-routers">
-  <img src="https://travis-ci.org/alanjds/drf-nested-routers.svg?branch=master">
+ <a href="https://github.com/alanjds/drf-nested-routers/actions?query=workflow%3ACI+branch%3Amaster">
+  <img src="https://github.com/alanjds/drf-nested-routers/workflows/CI/badge.svg?branch=master">
  </a>
  <a href="https://pypi.python.org/pypi/drf-nested-routers">
   <img src="https://img.shields.io/pypi/v/drf-nested-routers.svg">

requirements-tox.txt

@@ -1,13 +1,14 @@
 # Test requirements
-pytest==7.4.2
-pytest-cov==4.1.0
-pytest-django==4.5.2
+
+pytest==8.2.0
+pytest-cov==5.0.0
+pytest-django==4.8.0
 flake8==7.0.0
 ipdb==0.13.13
-pytz==2023.3
+pytz==2024.1
 
 # wheel for PyPI installs
-wheel==0.42.0
+wheel==0.43.0
 
 # MkDocs for documentation previews/deploys
 mkdocs==1.5.2

rest_framework_nested/relations.py

@@ -4,19 +4,12 @@
 These fields allow you to specify the style that should be used to represent
 model relationships with hyperlinks.
 """
-from __future__ import unicode_literals
-from functools import reduce # import reduce from functools for compatibility with python 3
+from functools import reduce
 
 import rest_framework.relations
 from rest_framework.relations import ObjectDoesNotExist, ObjectValueError, ObjectTypeError
 from rest_framework.exceptions import ValidationError
 
-# fix for basestring
-try:
- basestring
-except NameError:
- basestring = str
-
 
 class NestedHyperlinkedRelatedField(rest_framework.relations.HyperlinkedRelatedField):
  lookup_field = 'pk'
@@ -26,7 +19,7 @@ class NestedHyperlinkedRelatedField(rest_framework.relations.HyperlinkedRelatedF
 
  def __init__(self, *args, **kwargs):
  self.parent_lookup_kwargs = kwargs.pop('parent_lookup_kwargs', self.parent_lookup_kwargs)
- super(NestedHyperlinkedRelatedField, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
 
  def get_url(self, obj, view_name, request, format):
  """
@@ -103,4 +96,4 @@ def __init__(self, view_name=None, **kwargs):
  assert view_name is not None, 'The `view_name` argument is required.'
  kwargs['read_only'] = True
  kwargs['source'] = '*'
- super(NestedHyperlinkedIdentityField, self).__init__(view_name=view_name, **kwargs)
+ super().__init__(view_name=view_name, **kwargs)

rest_framework_nested/routers.py

@@ -25,7 +25,6 @@
  urlpatterns = router.urls
 """
 
-from __future__ import unicode_literals
 import sys
 import re
 from rest_framework.routers import SimpleRouter, DefaultRouter # noqa: F401
@@ -37,22 +36,22 @@
  IDENTIFIER_REGEX = re.compile(r"^[^\d\W]\w*$", re.UNICODE)
 
 
-class LookupMixin(object):
+class LookupMixin:
  """
  Deprecated.
 
  No method override is needed since Django Rest Framework 2.4.
  """
 
 
-class NestedMixin(object):
+class NestedMixin:
  def __init__(self, parent_router, parent_prefix, *args, **kwargs):
  self.parent_router = parent_router
  self.parent_prefix = parent_prefix
  self.nest_count = getattr(parent_router, 'nest_count', 0) + 1
- self.nest_prefix = kwargs.pop('lookup', 'nested_%i' % self.nest_count) + '_'
+ self.nest_prefix = kwargs.pop('lookup', f'nested_{self.nest_count}') + '_'
 
- super(NestedMixin, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
 
  if 'trailing_slash' not in kwargs:
  # Inherit trailing_slash only when not specified explicitly.
@@ -84,10 +83,7 @@ def __init__(self, parent_router, parent_prefix, *args, **kwargs):
  nested_routes = []
  parent_lookup_regex = parent_router.get_lookup_regex(parent_viewset, self.nest_prefix)
 
- self.parent_regex = '{parent_prefix}/{parent_lookup_regex}/'.format(
- parent_prefix=parent_prefix,
- parent_lookup_regex=parent_lookup_regex
- )
+ self.parent_regex = f'{parent_prefix}/{parent_lookup_regex}/'
  # If there is no parent prefix, the first part of the url is probably
  # controlled by the project's urls.py and the router is in an app,
  # so a slash in the beginning will (A) cause Django to give warnings
@@ -111,7 +107,7 @@ def __init__(self, parent_router, parent_prefix, *args, **kwargs):
 
  def check_valid_name(self, value):
  if IDENTIFIER_REGEX.match(value) is None:
- raise ValueError("lookup argument '{}' needs to be valid python identifier".format(value))
+ raise ValueError(f"lookup argument '{value}' needs to be valid python identifier")
 
 
 class NestedSimpleRouter(NestedMixin, SimpleRouter):

rest_framework_nested/serializers.py

@@ -27,10 +27,10 @@ class NestedHyperlinkedModelSerializer(rest_framework.serializers.HyperlinkedMod
 
  def __init__(self, *args, **kwargs):
  self.parent_lookup_kwargs = kwargs.pop('parent_lookup_kwargs', self.parent_lookup_kwargs)
- super(NestedHyperlinkedModelSerializer, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
 
  def build_url_field(self, field_name, model_class):
- field_class, field_kwargs = super(NestedHyperlinkedModelSerializer, self).build_url_field(
+ field_class, field_kwargs = super().build_url_field(
  field_name,
  model_class
  )

rest_framework_nested/viewsets.py

@@ -17,7 +17,7 @@ def _force_mutable(querydict: dict) -> dict:
  querydict._mutable = initial_mutability
 
 
-class NestedViewSetMixin(object):
+class NestedViewSetMixin:
  def _get_parent_lookup_kwargs(self) -> dict:
  """
  Locates and returns the `parent_lookup_kwargs` dict informing
@@ -44,7 +44,7 @@ def get_queryset(self):
  Filter the `QuerySet` based on its parents as defined in the
  `serializer_class.parent_lookup_kwargs` or `viewset.parent_lookup_kwargs`
  """
- queryset = super(NestedViewSetMixin, self).get_queryset()
+ queryset = super().get_queryset()
 
  if getattr(self, 'swagger_fake_view', False):
  return queryset

runtests.py

@@ -1,6 +1,4 @@
 #! /usr/bin/env python
-from __future__ import print_function
-
 import pytest
 import sys
 import os
@@ -32,7 +30,7 @@ def flake8_main(args):
 
 def split_class_and_function(string):
  class_string, function_string = string.split('.', 1)
- return "%s and %s" % (class_string, function_string)
+ return f"{class_string} and {function_string}"
 
 
 def is_function(string):

setup.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 import re
 import os
 import sys
@@ -59,8 +58,8 @@ def get_package_data(package):
  os.system("python setup.py sdist bdist_wheel")
  os.system("twine upload dist/*")
  print("You probably want to also tag the version now:")
- print(" git tag -a v{0} -m 'version {0}'".format(version))
- print(" git push origin v{0}".format(version))
+ print(f" git tag -a v{version} -m 'version {version}'")
+ print(f" git push origin v{version}")
  sys.exit()
 
 

tests/description.py

@@ -1,11 +1,3 @@
-# -- coding: utf-8 --
-
-# Apparently there is a python 2.6 issue where docstrings of imported view classes
-# do not retain their encoding information even if a module has a proper
-# encoding declaration at the top of its source file. Therefore for tests
-# to catch unicode related errors, a mock view has to be declared in a separate
-# module.
-
 from rest_framework.views import APIView
 
 

tests/models.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 from django.db import models
 from rest_framework import serializers
 
@@ -11,7 +10,7 @@ class CustomField(models.CharField):
 
  def __init__(self, *args, **kwargs):
  kwargs['max_length'] = 12
- super(CustomField, self).__init__(*args, **kwargs)
+ super().__init__(*args, **kwargs)
 
 
 class RESTFrameworkModel(models.Model):

tests/serializers/test_serializers.py

@@ -44,7 +44,7 @@ def setUpClass(cls):
  GrandChild1.objects.create(parent=child2, name='Child2-GrandChild1-C')
 
  Parent.objects.create(name='Parent2')
- return super(TestSerializers, cls).setUpClass()
+ return super().setUpClass()
 
  def test_default(self):
  url = reverse('parent1-detail', kwargs={'pk': 1})

tests/test_dynamic_routers.py

@@ -82,41 +82,41 @@ def test_dynamic_routes(self):
  self.assertFalse(hasattr(self.router, 'parent_regex'))
  urls = map_by_name(self.router.urls)
  self.assertEqual(
- get_regex_pattern(urls['basicmodel-list']), u'^detail/$'
+ get_regex_pattern(urls['basicmodel-list']), '^detail/$'
  )
  self.assertEqual(
  get_regex_pattern(urls['basicmodel-detail']),
- u'^detail/(?P<pk>[^/.]+)/$'
+ '^detail/(?P<pk>[^/.]+)/$'
  )
  self.assertEqual(
  get_regex_pattern(urls['basicmodel-set-password']),
- u'^detail/(?P<pk>[^/.]+)/set_password/$'
+ '^detail/(?P<pk>[^/.]+)/set_password/$'
  )
 
  def test_nested_parent(self):
  self.assertEqual(
  self.detail_router.parent_regex,
- u'detail/(?P<detail_pk>[^/.]+)/'
+ 'detail/(?P<detail_pk>[^/.]+)/'
  )
  urls = map_by_name(self.detail_router.urls)
 
  self.assertEqual(
  get_regex_pattern(urls['basicmodel-list']),
- u'^detail/(?P<detail_pk>[^/.]+)/list/$'
+ '^detail/(?P<detail_pk>[^/.]+)/list/$'
  )
 
  self.assertEqual(
  get_regex_pattern(urls['basicmodel-recent-users']),
- u'^detail/(?P<detail_pk>[^/.]+)/list/recent_users/$'
+ '^detail/(?P<detail_pk>[^/.]+)/list/recent_users/$'
  )
 
  self.assertEqual(
  get_regex_pattern(urls['basicmodel-detail']),
- u'^detail/(?P<detail_pk>[^/.]+)/list/(?P<pk>[^/.]+)/$'
+ '^detail/(?P<detail_pk>[^/.]+)/list/(?P<pk>[^/.]+)/$'
  )
 
  def test_nested_child(self):
  self.assertEqual(
  self.list_router.parent_regex,
- u'detail/(?P<detail_pk>[^/.]+)/list/(?P<list_pk>[^/.]+)/'
+ 'detail/(?P<detail_pk>[^/.]+)/list/(?P<list_pk>[^/.]+)/'
  )