Minor tweaks to 'lookup_value_regex' work

1 files changed, 3 insertions, 5 deletions

diff --git a/rest_framework/routers.py b/rest_framework/routers.py
index df1233fd..406ebcf7 100644
--- a/rest_framework/routers.py
+++ b/rest_framework/routers.py
@@ -220,12 +220,10 @@ class SimpleRouter(BaseRouter):
         https://github.com/alanjds/drf-nested-routers
         """
         base_regex = '(?P<{lookup_prefix}{lookup_field}>{lookup_value})'
+        # Use `pk` as default field, unset set.  Default regex should not
+        # consume `.json` style suffixes and should break at '/' boundaries.
         lookup_field = getattr(viewset, 'lookup_field', 'pk')
-        try:
-            lookup_value = viewset.lookup_value_regex
-        except AttributeError:
-            # Don't consume `.json` style suffixes
-            lookup_value = '[^/.]+'
+        lookup_value = getattr(viewset, 'lookup_value_regex', '[^/.]+')
         return base_regex.format(
             lookup_prefix=lookup_prefix,
             lookup_field=lookup_field,