diff options
| author | Mark Aaron Shirley | 2012-12-19 15:21:06 -0800 |
|---|---|---|
| committer | Mark Aaron Shirley | 2012-12-19 15:21:06 -0800 |
| commit | ef475eb9bd7754c7248642b4a41093e2d6493b03 (patch) | |
| tree | bc0faeb5cd04f02cf2cfa8db84fade4452549c0c /rest_framework/tests/hyperlinkedserializers.py | |
| parent | ae6ca7456feda199124eb78f7872f969fa67d7b8 (diff) | |
| parent | c27295dcbdf89b3cbc10d6325833e428c66c0f2a (diff) | |
| download | django-rest-framework-ef475eb9bd7754c7248642b4a41093e2d6493b03.tar.bz2 | |
Merge remote-tracking branch 'upstream/master' into writable-serializers
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() |