2 files changed, 7 insertions(+), 6 deletions(-)

M tox.ini
M wiki/models/__init__.py

@@ 10,7 10,6 @@ commands =
 deps =
      coverage
      pytest
-     pytest-django
      Pillow==2.3.0
      django-classy-tags==0.4
      six==1.6.1


@@ 21,6 20,7 @@ deps =
      django{15,16}: django-sekizai==0.7
      django{15,16}: django-mptt==0.7.2
      django{15,16}: sorl-thumbnail==11.12
+     django{15,16}: pytest-django<3
      django17: Django==1.7.8
      django17: django-mptt==0.7.4
      django18: Django==1.8.2


@@ 28,6 28,7 @@ deps =
      django{18,19}: django-mptt==0.8.0
      django{17,18,19}: django-sekizai==0.9.0
      django{17,18,19}: sorl-thumbnail==12.3
+     django{17,18,19}: pytest-django>=3
      py26: importlib
      py26: Markdown==2.4.1
      py{27,34}: Markdown==2.6.5

@@ 9,9 9,9 @@ import warnings
 from six import string_types
 
 # TODO: Don't use wildcards
-from .article import *
-from .pluginbase import *
-from .urlpath import *
+from .article import *  # noqa
+from .pluginbase import *  # noqa
+from .urlpath import *  # noqa
 
 # TODO: Should the below stuff be executed a more logical place?
 # Follow Django's default_settings.py / settings.py pattern and put these


@@ 51,7 51,7 @@ if hasattr(django_settings, 'TEMPLATES'):
     if len(backends) == 1:
         TEMPLATE_CONTEXT_PROCESSORS = backends[0].get('OPTIONS', {}).get('context_processors', [])
 
-if 'django.contrib.auth.context_processors.auth' not in django_settings.TEMPLATE_CONTEXT_PROCESSORS:
+if 'django.contrib.auth.context_processors.auth' not in TEMPLATE_CONTEXT_PROCESSORS:
     raise ImproperlyConfigured(
         'django-wiki: needs django.contrib.auth.context_processors.auth in TEMPLATE_CONTEXT_PROCESSORS')
 


@@ 75,7 75,7 @@ if VERSION < (1, 7):
             "django-wiki: No south in your INSTALLED_APPS. This is highly discouraged.")
 
 
-from django.core import urlresolvers
+from django.core import urlresolvers  # noqa
 
 original_django_reverse = urlresolvers.reverse