fixes django 1.11 compat issue

Author: saxix

.gitignore

@@ -22,3 +22,4 @@ __pycache__
 *.pyc
 *.egg-info
 *.sqlite
+.testmondata

CHANGES

@@ -1,6 +1,6 @@
 Release 1.4 (dev)
 -----------------
-*
+* django 1.11 compatibility
 
 
 Release 1.3.2 (10 Sep 2016)

README.rst

@@ -5,7 +5,7 @@ Django Concurrency
 
 django-concurrency is an optimistic lock [1]_ implementation for Django.
 
-Supported Django versions: 1.6.x, 1.7.x, 1.8.x, 1.9.
+Supported Django versions: 1.8.x, 1.9.x, 1.10.x., 1.11.x
 
 It prevents users from doing concurrent editing in Django both from UI and from a
 django command.

src/concurrency/config.py

@@ -1,7 +1,10 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.core.exceptions import ImproperlyConfigured
-from django.core.urlresolvers import get_callable
+try:
+    from django.core.urlresolvers import get_callable
+except ImportError:
+    from django.urls.utils import get_callable
 from django.test.signals import setting_changed
 from django.utils import six
 

src/concurrency/middleware.py

@@ -2,11 +2,16 @@
 from __future__ import absolute_import, unicode_literals
 
 from django.core.signals import got_request_exception
-from django.core.urlresolvers import get_callable
 
 from concurrency.config import conf
 from concurrency.exceptions import RecordModifiedError
 
+try:
+    from django.core.urlresolvers import get_callable
+except ImportError:
+    from django.urls.utils import get_callable
+
+
 
 class ConcurrencyMiddleware(object):
     """ Intercept :ref:`RecordModifiedError` and invoke a callable defined in

src/concurrency/views.py

@@ -4,7 +4,6 @@
 from django.http import HttpResponse
 from django.template import loader
 from django.template.base import Template
-from django.template.context import RequestContext
 from django.utils.translation import ugettext as _
 
 from concurrency.compat import TemplateDoesNotExist
@@ -40,7 +39,8 @@ def conflict(request, target=None, template_name='409.html'):
         saved = target.__class__._default_manager.get(pk=target.pk)
     except target.__class__.DoesNotExist:
         saved = None
-    ctx = RequestContext(request, {'target': target,
-                                   'saved': saved,
-                                   'request_path': request.path})
+    ctx = {'target': target,
+           'saved': saved,
+           'request_path': request.path}
+
     return ConflictResponse(template.render(ctx))

src/requirements/develop.pip

@@ -1,7 +1,7 @@
 coverage
 django_extensions
 flake8
-ipython
+ipython<6.0
 pdbpp
 psycopg2
 sphinx

src/requirements/testing.pip

@@ -7,6 +7,8 @@ pytest-django>=3.0.0
 pytest-echo>=1.3
 pytest-pythonpath>=0.7.1
 pytest>=3.0.3
+pytest-watch
+pytest-testmon
 pdbpp
 readline
 tox>=2.4.1

tests/demoapp/demo/models.py

@@ -209,7 +209,7 @@ class ConditionalVersionModel(models.Model):
     field1 = models.CharField(max_length=30, blank=True, null=True, unique=True)
     field2 = models.CharField(max_length=30, blank=True, null=True, unique=True)
     field3 = models.CharField(max_length=30, blank=True, null=True, unique=True)
-    user = models.ForeignKey(User, null=True)
+    user = models.ForeignKey(User, null=True, on_delete=models.CASCADE)
 
     class Meta:
         app_label = 'demo'
@@ -224,7 +224,8 @@ class Anything(models.Model):
     ConditionalVersionModelWithoutMeta instances.
     """
     name = models.CharField(max_length=10)
-    a_relation = models.ForeignKey('demo.ConditionalVersionModelWithoutMeta')
+    a_relation = models.ForeignKey('demo.ConditionalVersionModelWithoutMeta',
+                                   on_delete=models.CASCADE)
 
     class Meta:
         app_label = 'demo'
@@ -238,7 +239,7 @@ class ConditionalVersionModelWithoutMeta(models.Model):
     field1 = models.CharField(max_length=30, blank=True, null=True, unique=True)
     field2 = models.CharField(max_length=30, blank=True, null=True, unique=True)
     field3 = models.CharField(max_length=30, blank=True, null=True, unique=True)
-    user = models.ForeignKey(User, null=True)
+    user = models.ForeignKey(User, null=True, on_delete=models.CASCADE)
     anythings = models.ManyToManyField(Anything)
 
     class Meta:
@@ -248,8 +249,10 @@ class Meta:
 class ThroughRelation(models.Model):
     version = ConditionalVersionField()
     left = models.ForeignKey('demo.ConditionalVersionModelSelfRelation',
+                             on_delete=models.CASCADE,
                              related_name='+')
     right = models.ForeignKey('demo.ConditionalVersionModelSelfRelation',
+                              on_delete=models.CASCADE,
                               related_name='+')
 
     class Meta:

tests/demoapp/demo/urls.py

@@ -17,5 +17,5 @@
                    UpdateView.as_view(model=SimpleConcurrentModel),
                    name='concurrent-edit'),
                url(r'^admin/',
-                   include(admin.site.urls))
+                   admin.site.urls)
                )