diff options
| author | Tom Christie | 2012-02-21 20:57:36 +0000 |
|---|---|---|
| committer | Tom Christie | 2012-02-21 20:57:36 +0000 |
| commit | 5fd4c639d7c64572dd07dc31dcd627bed9469b05 (patch) | |
| tree | d7cf3ba46e76937176f81e1ebc334bc790e7026c /examples/blogpost | |
| parent | af9e4f69d732cc643d6ec7ae13d4a19ac0332d44 (diff) | |
| download | django-rest-framework-5fd4c639d7c64572dd07dc31dcd627bed9469b05.tar.bz2 | |
Merge master into develop
Diffstat (limited to 'examples/blogpost')
| -rw-r--r-- | examples/blogpost/resources.py | 2 | ||||
| -rw-r--r-- | examples/blogpost/tests.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/blogpost/resources.py b/examples/blogpost/resources.py index d4e0594d..d11c5615 100644 --- a/examples/blogpost/resources.py +++ b/examples/blogpost/resources.py @@ -1,5 +1,5 @@ from djangorestframework.resources import ModelResource -from djangorestframework.utils import reverse +from djangorestframework.reverse import reverse from blogpost.models import BlogPost, Comment diff --git a/examples/blogpost/tests.py b/examples/blogpost/tests.py index 9f72e686..23f1ac21 100644 --- a/examples/blogpost/tests.py +++ b/examples/blogpost/tests.py @@ -5,7 +5,7 @@ from django.test import TestCase from django.utils import simplejson as json from djangorestframework.compat import RequestFactory -from djangorestframework.utils import reverse +from djangorestframework.reverse import reverse from djangorestframework.views import InstanceModelView, ListOrCreateModelView from blogpost import models, urls |