diff options
| author | Tom Christie | 2013-08-23 16:46:14 +0100 |
|---|---|---|
| committer | Tom Christie | 2013-08-23 16:46:14 +0100 |
| commit | c77e4a2c591436dd9433f1bd4e3c6349d8f4b835 (patch) | |
| tree | e53387e123b093e5795080fb92f04df5e5b89f68 /rest_framework/tests | |
| parent | e23d5888522f98c30418452c0f833cf11589e0c1 (diff) | |
| parent | 436e66a42db21b52fd5e1582011d2f0f7f81f9c7 (diff) | |
| download | django-rest-framework-c77e4a2c591436dd9433f1bd4e3c6349d8f4b835.tar.bz2 | |
Merge branch 'master' into html-form-renderer
Diffstat (limited to 'rest_framework/tests')
| -rw-r--r-- | rest_framework/tests/test_routers.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/tests/test_routers.py b/rest_framework/tests/test_routers.py index 5fcccb74..e723f7d4 100644 --- a/rest_framework/tests/test_routers.py +++ b/rest_framework/tests/test_routers.py @@ -146,7 +146,7 @@ class TestTrailingSlashRemoved(TestCase): self.urls = self.router.urls def test_urls_can_have_trailing_slash_removed(self): - expected = ['^notes$', '^notes/(?P<pk>[^/]+)$'] + expected = ['^notes$', '^notes/(?P<pk>[^/.]+)$'] for idx in range(len(expected)): self.assertEqual(expected[idx], self.urls[idx].regex.pattern) |