[Python-modules-commits] [python-restless] 01/03: Django 1.10 compat from https://github.com/toastdriven/restless/pull/75/files

[Wolfgang Borgert]

This is an automated email from the git hooks/post-receive script.

debacle pushed a commit to branch master
in repository python-restless.

commit 130057ffd2fbcdfef96a4c286925b38b8f81e2e2
Author: W. Martin Borgert <debacle at debian.org>
Date:   Wed Jun 29 00:33:03 2016 +0200

    Django 1.10 compat from
    https://github.com/toastdriven/restless/pull/75/files
---
 restless/dj.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/restless/dj.py b/restless/dj.py
index 3ffb778..0e68569 100644
--- a/restless/dj.py
+++ b/restless/dj.py
@@ -1,7 +1,12 @@
 import six
 
+from distutils.version import StrictVersion
+from django import get_version as get_django_version
 from django.conf import settings
-from django.conf.urls import patterns, url
+if StrictVersion(get_django_version()) >= StrictVersion('1.7.0'):
+    from django.conf.urls import url
+else:
+    from django.conf.urls import patterns, url
 from django.core.exceptions import ObjectDoesNotExist
 from django.http import HttpResponse, Http404
 from django.views.decorators.csrf import csrf_exempt
@@ -82,9 +87,12 @@ class DjangoResource(Resource):
             ``api_blogpost_list``
         :type name_prefix: string
 
-        :returns: A ``patterns`` object for ``include(...)``
+        :returns: A ``list`` or ``patterns`` object for ``include(...)``
         """
-        return patterns('',
+        urls = [
             url(r'^$', cls.as_list(), name=cls.build_url_name('list', name_prefix)),
             url(r'^(?P<pk>\d+)/$', cls.as_detail(), name=cls.build_url_name('detail', name_prefix)),
-        )
+        ]
+        if StrictVersion(get_django_version()) >= StrictVersion('1.7.0'):
+            return urls
+        return patterns('', urls[0], urls[1])

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-restless.git