aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/tests/renderers.py
diff options
context:
space:
mode:
authorTom Christie2012-12-19 23:12:27 +0000
committerTom Christie2012-12-19 23:12:27 +0000
commita493c83248535c9fa7f78815b16bce7e88bf7966 (patch)
treeb52e34b8b6ecfcc08f0135bc0a503b939e53a3ec /rest_framework/tests/renderers.py
parentc097bcef586da4513d1d6f357d9eb3d7b4b0fffb (diff)
downloaddjango-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/renderers.py')
-rw-r--r--rest_framework/tests/renderers.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/rest_framework/tests/renderers.py b/rest_framework/tests/renderers.py
index fb843676..c1b4e624 100644
--- a/rest_framework/tests/renderers.py
+++ b/rest_framework/tests/renderers.py
@@ -1,13 +1,12 @@
import pickle
import re
-from django.conf.urls.defaults import patterns, url, include
from django.core.cache import cache
from django.test import TestCase
from django.test.client import RequestFactory
from rest_framework import status, permissions
-from rest_framework.compat import yaml
+from rest_framework.compat import yaml, patterns, url, include
from rest_framework.response import Response
from rest_framework.views import APIView
from rest_framework.renderers import BaseRenderer, JSONRenderer, YAMLRenderer, \