diff options
| author | Mark Aaron Shirley | 2012-12-19 15:24:22 -0800 |
|---|---|---|
| committer | Mark Aaron Shirley | 2012-12-19 15:24:22 -0800 |
| commit | 2f5582a1a6d8a79bfab7ffbc2d8b602fdae8e640 (patch) | |
| tree | 12e82ef942a21d456b33f6aacf90784a81feddc1 /rest_framework/tests/hyperlinkedserializers.py | |
| parent | 5c680c36e435ffa29ba6ed5f439d22ea4e849c67 (diff) | |
| parent | c27295dcbdf89b3cbc10d6325833e428c66c0f2a (diff) | |
| download | django-rest-framework-2f5582a1a6d8a79bfab7ffbc2d8b602fdae8e640.tar.bz2 | |
Merge remote-tracking branch 'upstream/master' into related-required
Diffstat (limited to 'rest_framework/tests/hyperlinkedserializers.py')
| -rw-r--r-- | rest_framework/tests/hyperlinkedserializers.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/tests/hyperlinkedserializers.py b/rest_framework/tests/hyperlinkedserializers.py index 24bf61bf..ee4d8e57 100644 --- a/rest_framework/tests/hyperlinkedserializers.py +++ b/rest_framework/tests/hyperlinkedserializers.py @@ -1,8 +1,8 @@ -from django.conf.urls.defaults import patterns, url from django.test import TestCase from django.test.client import RequestFactory from django.utils import simplejson as json from rest_framework import generics, status, serializers +from rest_framework.compat import patterns, url from rest_framework.tests.models import Anchor, BasicModel, ManyToManyModel, BlogPost, BlogPostComment, Album, Photo, OptionalRelationModel factory = RequestFactory() |