Fix deprecation warnings for Django 1.11 and Django 2.0.

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2017-07-21 00:25:18 -04:00
parent 42a762481b
commit f09321f6ab
81 changed files with 173 additions and 135 deletions

View File

@@ -1,8 +1,8 @@
from __future__ import unicode_literals
from django.apps import apps
from django.core.urlresolvers import reverse
from django.db import models
from django.urls import reverse
from django.utils.encoding import force_text, python_2_unicode_compatible
from django.utils.translation import ugettext

View File

@@ -3,9 +3,9 @@ from __future__ import unicode_literals
from django.conf import settings
from django.contrib import messages
from django.core.exceptions import PermissionDenied
from django.core.urlresolvers import reverse
from django.db.models.query import QuerySet
from django.http import HttpResponseRedirect
from django.urls import reverse
from django.utils.translation import ungettext, ugettext_lazy as _
from permissions import Permission

View File

@@ -49,8 +49,8 @@ class SharedUploadedFile(models.Model):
@python_2_unicode_compatible
class UserLocaleProfile(models.Model):
user = models.OneToOneField(
settings.AUTH_USER_MODEL, related_name='locale_profile',
verbose_name=_('User')
settings.AUTH_USER_MODEL, on_delete=models.CASCADE,
related_name='locale_profile', verbose_name=_('User')
)
timezone = models.CharField(
choices=zip(common_timezones, common_timezones), max_length=48,

View File

@@ -24,12 +24,12 @@ except sh.CommandNotFound:
DATE = None
@register.assignment_tag
@register.simple_tag
def get_collections():
return Collection.get_all()
@register.assignment_tag
@register.simple_tag
def get_dashboard_widgets():
return DashboardWidget.get_all()
@@ -52,7 +52,7 @@ def project_copyright():
return settings.PROJECT_COPYRIGHT
@register.assignment_tag
@register.simple_tag
def project_description():
return getattr(settings, 'PROJECT_DESCRIPTION', mayan.__description__)
@@ -77,7 +77,7 @@ def project_version():
return mayan.__version__
@register.assignment_tag(takes_context=True)
@register.simple_tag(takes_context=True)
def render_subtemplate(context, template_name, template_context):
"""
Renders the specified template with the mixed parent and
@@ -89,7 +89,7 @@ def render_subtemplate(context, template_name, template_context):
return get_template(template_name).render(new_context)
@register.assignment_tag
@register.simple_tag
def build():
if BUILD:
try:

View File

@@ -1,6 +1,6 @@
from __future__ import unicode_literals
from django.core.urlresolvers import reverse
from django.urls import reverse
from rest_api.tests import BaseAPITestCase

View File

@@ -3,9 +3,9 @@ from __future__ import absolute_import, unicode_literals
from django.conf.urls import url
from django.contrib.auth import get_user_model
from django.contrib.auth.models import Group
from django.core.urlresolvers import clear_url_caches, reverse
from django.http import HttpResponse
from django.template import Context, Template
from django.urls import clear_url_caches, reverse
from acls.models import AccessControlList
from permissions.models import Role
@@ -91,7 +91,7 @@ class GenericViewTestCase(BaseTestCase):
user = get_user_model().objects.get(username=username)
self.assertTrue(logged_in)
self.assertTrue(user.is_authenticated())
self.assertTrue(user.is_authenticated)
def login_user(self):
self.login(username=TEST_USER_USERNAME, password=TEST_USER_PASSWORD)

View File

@@ -8,7 +8,7 @@ import types
import xmlrpclib
from django.conf import settings
from django.core.urlresolvers import resolve as django_resolve
from django.urls import resolve as django_resolve
from django.urls.base import get_script_prefix
from django.utils.datastructures import MultiValueDict
from django.utils.encoding import force_text

View File

@@ -4,9 +4,9 @@ from json import dumps
from django.conf import settings
from django.contrib import messages
from django.core.urlresolvers import reverse, reverse_lazy
from django.http import Http404, HttpResponseRedirect
from django.template import RequestContext
from django.urls import reverse, reverse_lazy
from django.utils import timezone, translation
from django.utils.http import urlencode
from django.utils.translation import ugettext_lazy as _, ugettext