diff options
| author | Tom Christie | 2012-12-19 23:12:27 +0000 |
|---|---|---|
| committer | Tom Christie | 2012-12-19 23:12:27 +0000 |
| commit | a493c83248535c9fa7f78815b16bce7e88bf7966 (patch) | |
| tree | b52e34b8b6ecfcc08f0135bc0a503b939e53a3ec /rest_framework/tests/request.py | |
| parent | c097bcef586da4513d1d6f357d9eb3d7b4b0fffb (diff) | |
| download | django-rest-framework-a493c83248535c9fa7f78815b16bce7e88bf7966.tar.bz2 | |
urls, patterns, include imports move to compat to support incoming 1.3 thru 1.6 import compatability
Diffstat (limited to 'rest_framework/tests/request.py')
| -rw-r--r-- | rest_framework/tests/request.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/rest_framework/tests/request.py b/rest_framework/tests/request.py index 2850992d..2eb34cea 100644 --- a/rest_framework/tests/request.py +++ b/rest_framework/tests/request.py @@ -1,16 +1,15 @@ """ Tests for content parsing, and form-overloaded content parsing. """ -from django.conf.urls.defaults import patterns from django.contrib.auth.models import User from django.contrib.auth import authenticate, login, logout from django.contrib.sessions.middleware import SessionMiddleware from django.test import TestCase, Client +from django.test.client import RequestFactory from django.utils import simplejson as json - from rest_framework import status from rest_framework.authentication import SessionAuthentication -from django.test.client import RequestFactory +from rest_framework.compat import patterns from rest_framework.parsers import ( BaseParser, FormParser, |
