From 3cd15fb1713dfc49e1bf1fd48045ca3ae5654e18 Mon Sep 17 00:00:00 2001
From: Paul Melnikow
Date: Sat, 4 Jan 2014 16:57:50 -0500
Subject: Router: Do not automatically adjust lookup_regex when trailing_slash
 is True

BREAKING CHANGE

When trailing_slash is set to True, the router no longer will adjust the lookup regex to allow it to include periods. To simulate the old behavior, the programmer should specify `lookup_regex = '[^/]+'` on the viewset.

https://github.com/tomchristie/django-rest-framework/pull/1328#issuecomment-31517099
---
 rest_framework/routers.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'rest_framework/routers.py')

diff --git a/rest_framework/routers.py b/rest_framework/routers.py
index 8766ecb2..df1233fd 100644
--- a/rest_framework/routers.py
+++ b/rest_framework/routers.py
@@ -224,11 +224,8 @@ class SimpleRouter(BaseRouter):
         try:
             lookup_value = viewset.lookup_value_regex
         except AttributeError:
-            if self.trailing_slash:
-                lookup_value = '[^/]+'
-            else:
-                # Don't consume `.json` style suffixes
-                lookup_value = '[^/.]+'
+            # Don't consume `.json` style suffixes
+            lookup_value = '[^/.]+'
         return base_regex.format(
             lookup_prefix=lookup_prefix,
             lookup_field=lookup_field,
-- 
cgit v1.2.3