Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

django2 compatibility #25

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ INSTALLED_APPS += [
'aldryn_redirects'
]

# add the middleware somewhere near the top of MIDDLEWARE_CLASSES
# add the middleware somewhere near the top of MIDDLEWARE

MIDDLEWARE_CLASSES.insert(
MIDDLEWARE.insert(
0, 'aldryn_redirects.middleware.RedirectFallbackMiddleware')
```
2 changes: 1 addition & 1 deletion aldryn_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
class Form(forms.BaseForm):
def to_settings(self, data, settings):
# No need to setup django-parler. That is already done in aldryn-django-cms
settings['MIDDLEWARE_CLASSES'].insert(0, 'aldryn_redirects.middleware.RedirectFallbackMiddleware')
settings['MIDDLEWARE'].insert(0, 'aldryn_redirects.middleware.RedirectFallbackMiddleware')
return settings
2 changes: 1 addition & 1 deletion aldryn_redirects/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

from django.conf import settings
from django.contrib import admin, messages
from django.core.urlresolvers import reverse
from django.urls import reverse
from django.http import HttpResponse
from django.shortcuts import redirect, render
from django.utils import timezone
Expand Down
2 changes: 1 addition & 1 deletion aldryn_redirects/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from django.db import models
from django.contrib.sites.models import Site
from django.core.urlresolvers import reverse
from django.urls import reverse
from django.utils.encoding import python_2_unicode_compatible
from django.utils.translation import ugettext_lazy as _, ugettext

Expand Down
2 changes: 1 addition & 1 deletion tests/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from __future__ import unicode_literals, print_function, division

HELPER_SETTINGS = {
'MIDDLEWARE_CLASSES': [
'MIDDLEWARE': [
'aldryn_redirects.middleware.RedirectFallbackMiddleware',
],
'INSTALLED_APPS': [
Expand Down