Django 2.0 support

Author: asifpy

.gitignore

@@ -6,7 +6,7 @@ build
 dist
 *.egg-info
 example/db.sqlite3
-#example/example/migrations*
+example/example/migrations*
 .DS_Store
 .idea
 .venv

.travis.yml

@@ -8,18 +8,9 @@ script:
  - coverage run --source=crudbuilder runtests.py
 env:
  matrix:
- - DJANGO="1.8.2"
- - DJANGO="1.9.2"
  - DJANGO="1.10"
- - DJANGO="1.11.7"
-
-matrix:
- exclude:
- # Django 1.9+ no longer supports python 3.2/3.3
- - python: "3.3"
- env: DJANGO="1.9.2"
- - python: "3.3"
- env: DJANGO="1.10"
+ - DJANGO="1.11.8"
+ - DJANGO="2.0"
 
 install:
  - pip install -q Django==$DJANGO

README.rst

@@ -48,7 +48,7 @@ Features:
 
 Prerequisites
 -------------
-- Django 1.8+
+- Django 1.10+
 - Python 2.7+, 3.3+
 - Django Tables2
 

crudbuilder/helpers.py

@@ -195,3 +195,18 @@ def custom_postfix_url(crud, model):
  if not postfix:
  postfix = plural(model)
  return postfix
+
+
+def get_urlresolver():
+ """Returns apporpriate urlresolver based on django version"""
+
+ try:
+ from django.core import urlresolvers
+ return urlresolvers
+ except ImportError:
+ from django import urls
+ return urls
+
+
+reverse_lazy = get_urlresolver().reverse_lazy
+reverse = get_urlresolver().reverse

crudbuilder/mixins.py

@@ -32,7 +32,7 @@ def dispatch(self, request, *args, **kwargs):
  settings, 'LOGIN_REQUIRED_FOR_CRUD', False)
 
  if global_login_required or self.login_required:
- if not request.user.is_authenticated():
+ if not request.user.is_authenticated:
  return self.handle_login_required(request)
 
  return super(LoginRequiredMixin, self).dispatch(
@@ -80,7 +80,7 @@ def get_context_data(self, **kwargs):
  try:
  context['exclude'] = self.detailview_excludes
  except:
- context['exclude'] =None
+ context['exclude'] = None
  context['actual_model_name'] = model.__name__.lower()
  context['pluralized_model_name'] = plural(model.__name__.lower())
  context['verbose_model_name'] = model._meta.verbose_name

crudbuilder/tests/models.py

@@ -1,4 +1,5 @@
 from django.db import models
+from django.db.models import CASCADE
 from django.contrib.auth.models import User
 
 # User = get_user_model()
@@ -16,4 +17,6 @@ class TestChildModel(models.Model):
  TestModel,
  blank=True,
  null=True,
- related_name='children')
+ related_name='children',
+ on_delete=CASCADE
+ )

crudbuilder/tests/test_views.py

@@ -1,9 +1,9 @@
 from django.test import TestCase, Client
 from django.contrib.auth.models import User
 from django.template import Context, Template
-from django.core.urlresolvers import reverse
 from django.test.utils import override_settings
 
+from crudbuilder.helpers import reverse
 from crudbuilder.tests.models import TestModel
 from crudbuilder.tests.crud import TestModelCrud, TestChildInlineFormset
 from crudbuilder.tests.forms import TestModelForm

crudbuilder/views.py

@@ -1,4 +1,3 @@
-from django.core.urlresolvers import reverse_lazy
 from django.forms.models import modelform_factory
 from django.views.generic import (
  DetailView,
@@ -19,7 +18,11 @@
 )
 from crudbuilder.abstract import BaseBuilder
 from crudbuilder.tables import TableBuilder
-from crudbuilder.helpers import model_class_form, plural
+from crudbuilder.helpers import (
+ model_class_form,
+ plural,
+ reverse_lazy
+)
 
 
 class ViewBuilder(BaseBuilder):

example/example/crud.py

@@ -27,7 +27,7 @@ class PersonCrud(BaseCrudBuilder):
  # custom_table2 = CustomPersonTable
 
  # detailview_excludes = ['img']
- inlineformset = PersonEmploymentInlineFormset
+ # inlineformset = PersonEmploymentInlineFormset
 
  # custom_templates = {
  # 'list': 'yourtemplates/template.html'

example/example/migrations/0001_initial.py

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.4 on 2017-08-03 20:34
-from __future__ import unicode_literals
+# Generated by Django 2.0 on 2017-12-03 14:31
 
 from django.conf import settings
 from django.db import migrations, models