Merge remote-tracking branch 'reference/py3k' into p3k

1 files changed, 16 insertions, 0 deletions

diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index 6ffada48..d5a9d995 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -8,6 +8,12 @@ import six
 
 import django
 
+# location of patterns, url, include changes in 1.4 onwards
+try:
+    from django.conf.urls import patterns, url, include
+except:
+    from django.conf.urls.defaults import patterns, url, include
+
 # django-filter is optional
 try:
     import django_filters
@@ -24,6 +30,16 @@ except ImportError:
 from six import BytesIO
 
 
+# Try to import PIL in either of the two ways it can end up installed.
+try:
+    from PIL import Image
+except ImportError:
+    try:
+        import Image
+    except ImportError:
+        Image = None
+
+
 def get_concrete_model(model_cls):
     try:
         return model_cls._meta.concrete_model