[Python-modules-commits] [python-restless] 02/03: merge patched into master

[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 7a481d6b9230c16007472e6440ca1e05312ac18c
Merge: 4618fb5 130057f
Author: W. Martin Borgert <debacle at debian.org>
Date:   Wed Jun 29 00:34:10 2016 +0200

    merge patched into master

 debian/.git-dpm                                   |  4 +--
 debian/patches/0002-Django-1.10-compat-from.patch | 44 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 restless/dj.py                                    | 16 ++++++---
 4 files changed, 59 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index 8d396c5,0000000..179f944
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- d3c1ef683003b1fb6a49cc88a4f31971102232da
- d3c1ef683003b1fb6a49cc88a4f31971102232da
++130057ffd2fbcdfef96a4c286925b38b8f81e2e2
++130057ffd2fbcdfef96a4c286925b38b8f81e2e2
 +9e101c7e3823f117d7d3aa2425d8576d918a616c
 +9e101c7e3823f117d7d3aa2425d8576d918a616c
 +python-restless_2.0.1.orig.tar.gz
 +c1319b4cec2e833751193acd066e2e14b7c60073
 +46996
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Django-1.10-compat-from.patch
index 0000000,0000000..f7a0f1b
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Django-1.10-compat-from.patch
@@@ -1,0 -1,0 +1,44 @@@
++From 130057ffd2fbcdfef96a4c286925b38b8f81e2e2 Mon Sep 17 00:00:00 2001
++From: "W. Martin Borgert" <debacle at debian.org>
++Date: Wed, 29 Jun 2016 00:33:03 +0200
++Subject: =?UTF-8?q?Django=201.10=20compat=20from=0Ahttps://github.com/toas?=
++ =?UTF-8?q?tdriven/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])
diff --cc debian/patches/series
index dd98f88,0000000..0fc3dc8
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-fix-test-fail.patch
++0002-Django-1.10-compat-from.patch

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