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 | |
| parent | af9e4f69d732cc643d6ec7ae13d4a19ac0332d44 (diff) | |
| download | django-rest-framework-5fd4c639d7c64572dd07dc31dcd627bed9469b05.tar.bz2 | |
Merge master into develop
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/blogpost/resources.py | 2 | ||||
| -rw-r--r-- | examples/blogpost/tests.py | 2 | ||||
| -rw-r--r-- | examples/mixin/urls.py | 2 | ||||
| -rw-r--r-- | examples/objectstore/views.py | 2 | ||||
| -rw-r--r-- | examples/permissionsexample/views.py | 2 | ||||
| -rw-r--r-- | examples/pygments_api/views.py | 2 | ||||
| -rw-r--r-- | examples/resourceexample/views.py | 2 | ||||
| -rw-r--r-- | examples/sandbox/views.py | 2 |
8 files changed, 8 insertions, 8 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 diff --git a/examples/mixin/urls.py b/examples/mixin/urls.py index c899467b..102f2c12 100644 --- a/examples/mixin/urls.py +++ b/examples/mixin/urls.py @@ -2,7 +2,7 @@ from djangorestframework.compat import View # Use Django 1.3's django.views.gen from djangorestframework.mixins import ResponseMixin from djangorestframework.renderers import DEFAULT_RENDERERS from djangorestframework.response import Response -from djangorestframework.utils import reverse +from djangorestframework.reverse import reverse from django.conf.urls.defaults import patterns, url diff --git a/examples/objectstore/views.py b/examples/objectstore/views.py index a8bc249a..b48bfac2 100644 --- a/examples/objectstore/views.py +++ b/examples/objectstore/views.py @@ -1,6 +1,6 @@ from django.conf import settings -from djangorestframework.utils import reverse +from djangorestframework.reverse import reverse from djangorestframework.views import View from djangorestframework.response import Response from djangorestframework import status diff --git a/examples/permissionsexample/views.py b/examples/permissionsexample/views.py index 0bc31b27..13384c9f 100644 --- a/examples/permissionsexample/views.py +++ b/examples/permissionsexample/views.py @@ -1,7 +1,7 @@ from djangorestframework.views import View from djangorestframework.response import Response from djangorestframework.permissions import PerUserThrottling, IsAuthenticated -from djangorestframework.utils import reverse +from djangorestframework.reverse import reverse class PermissionsExampleView(View): diff --git a/examples/pygments_api/views.py b/examples/pygments_api/views.py index bca3dac6..75d36fea 100644 --- a/examples/pygments_api/views.py +++ b/examples/pygments_api/views.py @@ -4,7 +4,7 @@ from django.conf import settings from djangorestframework.resources import FormResource from djangorestframework.response import Response from djangorestframework.renderers import BaseRenderer -from djangorestframework.utils import reverse +from djangorestframework.reverse import reverse from djangorestframework.views import View from djangorestframework import status diff --git a/examples/resourceexample/views.py b/examples/resourceexample/views.py index f2a7a08a..8e7be302 100644 --- a/examples/resourceexample/views.py +++ b/examples/resourceexample/views.py @@ -1,4 +1,4 @@ -from djangorestframework.utils import reverse +from djangorestframework.reverse import reverse from djangorestframework.views import View from djangorestframework.response import Response from djangorestframework import status diff --git a/examples/sandbox/views.py b/examples/sandbox/views.py index 34216ad2..a9b82447 100644 --- a/examples/sandbox/views.py +++ b/examples/sandbox/views.py @@ -1,6 +1,6 @@ """The root view for the examples provided with Django REST framework""" -from djangorestframework.utils import reverse +from djangorestframework.reverse import reverse from djangorestframework.views import View from djangorestframework.response import Response |