Merge remote-tracking branch 'reference/2.4.0' into feature/pytest

Conflicts:
	rest_framework/runtests/urls.py
	tests/test_response.py
	tox.ini

1 files changed, 1 insertions, 1 deletions

diff --git a/tests/test_request.py b/tests/test_request.py
index 0a9355f0..0cde0fb4 100644
--- a/tests/test_request.py
+++ b/tests/test_request.py
@@ -2,6 +2,7 @@
 Tests for content parsing, and form-overloaded content parsing.
 """
 from __future__ import unicode_literals
+from django.conf.urls import patterns
 from django.contrib.auth.models import User
 from django.contrib.auth import authenticate, login, logout
 from django.contrib.sessions.middleware import SessionMiddleware
@@ -9,7 +10,6 @@ from django.core.handlers.wsgi import WSGIRequest
 from django.test import TestCase
 from rest_framework import status
 from rest_framework.authentication import SessionAuthentication
-from rest_framework.compat import patterns
 from rest_framework.parsers import (
     BaseParser,
     FormParser,