Skip to content

Commit badd1c1

Browse files
committed
rename already_registered function; return True/False
1 parent 2cbe3c6 commit badd1c1

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

rest_framework/routers.py

+9-12
Original file line numberDiff line numberDiff line change
@@ -53,25 +53,22 @@ def register(self, prefix, viewset, basename=None):
5353
if basename is None:
5454
basename = self.get_default_basename(viewset)
5555

56-
if not self.basename_already_registered(basename):
57-
self.registry.append((prefix, viewset, basename))
56+
if self.is_already_registered(basename):
57+
msg = (f'Route with basename "{basename}" is already registered. '
58+
f'Please provide a unique basename for viewset "{viewset}"')
59+
raise ImproperlyConfigured(msg)
60+
61+
self.registry.append((prefix, viewset, basename))
5862

5963
# invalidate the urls cache
6064
if hasattr(self, '_urls'):
6165
del self._urls
6266

63-
def basename_already_registered(self, new_basename):
67+
def is_already_registered(self, new_basename):
6468
"""
65-
If `basename` is already registered, raise an exception
69+
Check if `basename` is already registered
6670
"""
67-
for route in self.registry:
68-
prefix, viewset, basename = route
69-
if new_basename == basename:
70-
msg = (f'Route with basename "{new_basename}" is already registered. '
71-
f'Please provide a unique basename for viewset "{viewset}"')
72-
raise ImproperlyConfigured(msg)
73-
74-
return False
71+
return any(basename == new_basename for _prefix, _viewset, basename in self.registry)
7572

7673
def get_default_basename(self, viewset):
7774
"""

0 commit comments

Comments
 (0)