97 files changed, 6 insertions(+), 213 deletions(-)

M src/wiki/__init__.py
M src/wiki/admin.py
M src/wiki/apps.py
M src/wiki/conf/settings.py
M src/wiki/core/compat.py
M src/wiki/core/diff.py
M src/wiki/core/http.py
M src/wiki/core/markdown/__init__.py
M src/wiki/core/markdown/mdx/codehilite.py
M src/wiki/core/markdown/mdx/previewlinks.py
M src/wiki/core/markdown/mdx/responsivetable.py
M src/wiki/core/permissions.py
M src/wiki/core/plugins/base.py
M src/wiki/core/plugins/loader.py
M src/wiki/core/plugins/registry.py
M src/wiki/core/utils.py
M src/wiki/core/version.py
M src/wiki/decorators.py
M src/wiki/editors/__init__.py
M src/wiki/editors/base.py
M src/wiki/editors/markitup.py
M src/wiki/forms.py
M src/wiki/managers.py
M src/wiki/migrations/0001_initial.py
M src/wiki/migrations/0002_urlpath_moved_to.py
M src/wiki/models/__init__.py
M src/wiki/models/article.py
M src/wiki/models/pluginbase.py
M src/wiki/models/urlpath.py
M src/wiki/plugins/attachments/__init__.py
M src/wiki/plugins/attachments/admin.py
M src/wiki/plugins/attachments/apps.py
M src/wiki/plugins/attachments/forms.py
M src/wiki/plugins/attachments/markdown_extensions.py
M src/wiki/plugins/attachments/migrations/0001_initial.py
M src/wiki/plugins/attachments/migrations/0002_auto_20151118_1816.py
M src/wiki/plugins/attachments/models.py
M src/wiki/plugins/attachments/settings.py
M src/wiki/plugins/attachments/urls.py
M src/wiki/plugins/attachments/views.py
M src/wiki/plugins/attachments/wiki_plugin.py
M src/wiki/plugins/globalhistory/__init__.py
M src/wiki/plugins/globalhistory/apps.py
M src/wiki/plugins/globalhistory/settings.py
M src/wiki/plugins/globalhistory/views.py
M src/wiki/plugins/globalhistory/wiki_plugin.py
M src/wiki/plugins/haystack/__init__.py
M src/wiki/plugins/haystack/search_indexes.py
M src/wiki/plugins/haystack/views.py
M src/wiki/plugins/help/__init__.py
M src/wiki/plugins/help/apps.py
M src/wiki/plugins/help/models.py
M src/wiki/plugins/help/wiki_plugin.py
M src/wiki/plugins/images/__init__.py
M src/wiki/plugins/images/admin.py
M src/wiki/plugins/images/apps.py
M src/wiki/plugins/images/forms.py
M src/wiki/plugins/images/markdown_extensions.py
M src/wiki/plugins/images/migrations/0001_initial.py
M src/wiki/plugins/images/migrations/0002_auto_20151118_1811.py
M src/wiki/plugins/images/models.py
M src/wiki/plugins/images/settings.py
M src/wiki/plugins/images/templatetags/wiki_images_tags.py
M src/wiki/plugins/images/templatetags/wiki_thumbnails.py
M src/wiki/plugins/images/views.py
M src/wiki/plugins/images/wiki_plugin.py
M src/wiki/plugins/links/__init__.py
M src/wiki/plugins/links/apps.py
M src/wiki/plugins/links/mdx/djangowikilinks.py
M src/wiki/plugins/links/mdx/urlize.py
M src/wiki/plugins/links/settings.py
M src/wiki/plugins/links/views.py
M src/wiki/plugins/links/wiki_plugin.py
M src/wiki/plugins/macros/__init__.py
M src/wiki/plugins/macros/apps.py
M src/wiki/plugins/macros/mdx/macro.py
M src/wiki/plugins/macros/mdx/toc.py
M src/wiki/plugins/macros/mdx/wikilinks.py
M src/wiki/plugins/macros/settings.py
M src/wiki/plugins/macros/templatetags/wiki_macro_tags.py
M src/wiki/plugins/macros/wiki_plugin.py
M src/wiki/plugins/notifications/__init__.py
M src/wiki/plugins/notifications/apps.py
M src/wiki/plugins/notifications/forms.py
M src/wiki/plugins/notifications/management/commands/wiki_notifications_create_defaults.py
M src/wiki/plugins/notifications/migrations/0001_initial.py
M src/wiki/plugins/notifications/migrations/0002_auto_20151118_1811.py
M src/wiki/plugins/notifications/models.py
M src/wiki/plugins/notifications/settings.py
M src/wiki/plugins/notifications/util.py
M src/wiki/plugins/notifications/views.py
M src/wiki/plugins/notifications/wiki_plugin.py
M src/wiki/templatetags/wiki_tags.py
M src/wiki/urls.py
M src/wiki/views/accounts.py
M src/wiki/views/article.py
M src/wiki/views/mixins.py

@@ 1,4 1,3 @@
-from __future__ import unicode_literals
 # -*- coding: utf-8 -*-
 # This package and all its sub-packages are part of django-wiki,
 # except where otherwise stated.

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django import forms
 from django.contrib import admin
 from django.contrib.contenttypes.admin import GenericTabularInline

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.apps import AppConfig
 from django.utils.translation import ugettext_lazy as _
 

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 import bleach
 
 from django.apps import apps

@@ 1,8 1,7 @@
 """Abstraction layer to deal with Django related changes in order to keep
 compatibility with several Django versions simultaneously."""
-from __future__ import unicode_literals
-
 from django.conf import settings as django_settings
+from urllib.parse import urljoin  # noqa
 
 USER_MODEL = getattr(django_settings, 'AUTH_USER_MODEL', 'auth.User')
 


@@ 21,11 20,3 @@ class BuildAttrsCompat(object):
         if kwargs is not None:
             attrs.update(kwargs)
         return attrs
-
-
-try:
-    # Python 3
-    from urllib.parse import urljoin  # noqa
-except ImportError:
-    # Python 2
-    from urlparse import urljoin  # noqa @UnusedImport

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 import difflib
 
 

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 import mimetypes
 import os
 from datetime import datetime

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 import bleach
 import markdown
 

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 import logging
 import re
 

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 import markdown
 from markdown.treeprocessors import Treeprocessor
 

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 import markdown
 from markdown.treeprocessors import Treeprocessor
 from markdown.util import etree

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from wiki.conf import settings
 
 

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django import forms
 from django.utils.translation import ugettext as _
 

@@ 1,6 1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
-
 from django.utils.module_loading import autodiscover_modules
 
 

@@ 1,6 1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from importlib import import_module
 
 from django.utils.six import string_types

@@ 1,6 1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from importlib import import_module
 
 from django.http.response import JsonResponse

@@ 30,8 30,6 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 """
-from __future__ import unicode_literals
-
 import datetime
 import os
 import subprocess

@@ 1,6 1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from functools import wraps
 
 from django.core.urlresolvers import reverse

@@ 1,4 1,3 @@
-from __future__ import absolute_import
 from wiki.conf import settings
 from django.core.urlresolvers import get_callable
 

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django import forms
 
 

@@ 1,6 1,4 @@
 # -*- coding: utf-8
-from __future__ import unicode_literals
-
 from django import forms
 from django.forms.utils import flatatt
 from django.utils.encoding import force_text

@@ 1,6 1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import random
 import string
 from datetime import timedelta

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.db import models
 from django.db.models import Q, Count
 from django.db.models.query import EmptyQuerySet, QuerySet

@@ 1,6 1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import django.db.models.deletion
 import mptt.fields
 from django.conf import settings

@@ 1,7 1,5 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.10.7 on 2017-06-06 23:18
-from __future__ import unicode_literals
-
 import django.db.models.deletion
 import mptt.fields
 from django.db import migrations

@@ 1,7 1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 from django.apps import apps
 from django.conf import settings as django_settings
 from django.core.exceptions import ImproperlyConfigured

@@ 1,6 1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
 from django.core.cache import cache

@@ 19,8 19,6 @@ There are three kinds of plugin base models:
 
 
 """
-from __future__ import unicode_literals
-
 from django.db import models
 from django.db.models import signals
 from django.utils.translation import ugettext_lazy as _

@@ 1,6 1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
-
 import logging
 import warnings
 

@@ 1,3 1,1 @@
-from __future__ import unicode_literals
-
 default_app_config = 'wiki.plugins.attachments.apps.AttachmentsConfig'

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib import admin
 
 from . import models

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.apps import AppConfig
 from django.utils.translation import ugettext_lazy as _
 

@@ 1,6 1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import tempfile
 import zipfile
 

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 import re
 
 import markdown

@@ 1,6 1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models

@@ 1,6 1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

@@ 1,6 1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function, unicode_literals
-
 import os
 
 from django.conf import settings as django_settings

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.conf import settings as django_settings
 from django.core.exceptions import ImproperlyConfigured
 from wiki.conf import settings as wiki_settings

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.conf.urls import url
 from wiki.plugins.attachments import views
 

@@ 1,6 1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.contrib import messages
 from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import Q

@@ 1,6 1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.conf.urls import include, url
 from django.utils.translation import ugettext as _
 from wiki.core.plugins import registry

@@ 1,3 1,1 @@
-from __future__ import unicode_literals
-
 default_app_config = 'wiki.plugins.globalhistory.apps.GlobalHistoryConfig'

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.apps import AppConfig
 from django.utils.translation import ugettext_lazy as _
 

@@ 1,3 1,1 @@
-from __future__ import unicode_literals
-
 SLUG = 'globalhistory'

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib.auth.decorators import login_required
 from django.db.models import F
 from django.utils.decorators import method_decorator

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.conf.urls import url
 from wiki.core.plugins import registry
 from wiki.core.plugins.base import BasePlugin

@@ 1,5 1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
 from wiki.conf import settings
 from wiki.core import permissions
 from wiki import models


@@ 19,22 17,13 @@ class SearchViewHaystack(haystack_views.SearchView):
 
     @classonlymethod
     def as_view(cls, *args, **kwargs):
-        return haystack_views.search_view_factory(
-            view_class=cls,
-            *
-            args,
-            **kwargs)
+        return haystack_views.search_view_factory(view_class=cls, *args, **kwargs)
 
     def dispatch(self, request, *args, **kwargs):
         # Do not allow anonymous users to search if they cannot read content
         if request.user.is_anonymous() and not settings.ANONYMOUS:
             return redirect(settings.LOGIN_URL)
-        return super(
-            SearchViewHaystack,
-            self).dispatch(
-            request,
-            *args,
-            **kwargs)
+        return super().dispatch(request, *args, **kwargs)
 
     def __filter_can_read(self, user):
         """Filter objects so only the ones with a user's reading access


@@ 68,6 57,6 @@ class SearchViewHaystack(haystack_views.SearchView):
         return self.create_response()
 
     def extra_context(self):
-        extra = super(SearchViewHaystack, self).extra_context()
+        extra = super().extra_context()
         extra['search_query'] = self.query
         return extra

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from haystack import indexes
 from wiki import models
 

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from haystack.backends import SQ
 from haystack.inputs import AutoQuery
 from haystack.query import SearchQuerySet

@@ 1,3 1,1 @@
-from __future__ import unicode_literals
-
 default_app_config = 'wiki.plugins.help.apps.HelpConfig'

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.apps import AppConfig
 from django.utils.translation import ugettext_lazy as _
 

@@ 1,1 0,0 @@
-from __future__ import absolute_import

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.utils.translation import ugettext as _
 from wiki.core.plugins import registry
 from wiki.core.plugins.base import BasePlugin

@@ 1,3 1,1 @@
-from __future__ import unicode_literals
-
 default_app_config = 'wiki.plugins.images.apps.ImagesConfig'

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django import forms
 from django.contrib import admin
 

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.apps import AppConfig
 from django.utils.translation import ugettext_lazy as _
 

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext

@@ 1,6 1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import re
 
 import markdown

@@ 1,6 1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import wiki.plugins.images.models
 from django.db import migrations, models
 

@@ 1,6 1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 import os.path
 
 from django.apps import apps

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.conf import settings as django_settings
 from wiki.conf import settings as wiki_settings
 

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django import template
 from wiki.plugins.images import models, settings
 

@@ 1,2 1,1 @@
-from __future__ import absolute_import
 from sorl.thumbnail.templatetags.thumbnail import register  # NOQA

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 import logging
 
 from django.contrib import messages

@@ 1,6 1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.conf.urls import url
 from django.utils.translation import ugettext as _
 from wiki.core.plugins import registry

@@ 1,3 1,1 @@
-from __future__ import unicode_literals
-
 default_app_config = 'wiki.plugins.links.apps.LinksConfig'

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.apps import AppConfig
 from django.utils.translation import ugettext_lazy as _
 

@@ 1,7 1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-'''
+"""
 Wikipath Extension for Python-Markdown
 ======================================
 


@@ 18,9 18,7 @@ Basic usage:
 Dependencies:
 * [Python 2.3+](http://python.org)
 * [Markdown 2.0+](http://www.freewisdom.org/projects/python-markdown/)
-'''
-from __future__ import unicode_literals
-
+"""
 from os import path as os_path
 
 import markdown

@@ 1,6 1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import re
 
 import markdown

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.conf import settings as django_settings
 
 #: If a relative slug is used in a wiki markdown link and no article is

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.utils.decorators import method_decorator
 from django.views.generic.base import View
 from wiki import models

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 # -*- coding: utf-8 -*-
 from django.conf.urls import url
 from django.core.urlresolvers import reverse_lazy

@@ 1,3 1,1 @@
-from __future__ import unicode_literals
-
 default_app_config = 'wiki.plugins.macros.apps.MacrosConfig'

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.apps import AppConfig
 from django.utils.translation import ugettext_lazy as _
 

@@ 1,6 1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import re
 
 import markdown

@@ 21,8 21,6 @@ SO WE AN JUST DEPEND ON THAT!
 
 
 """
-from __future__ import unicode_literals
-
 import re
 import unicodedata
 

@@ 2,8 2,6 @@
 """
 Extend the shipped Markdown extension 'wikilinks'
 """
-from __future__ import unicode_literals
-
 import re
 
 import markdown

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.conf import settings as django_settings
 
 SLUG = 'macros'

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django import template
 from wiki.plugins.macros import settings
 from wiki.plugins.macros.mdx.macro import MacroPreprocessor

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.utils.translation import ugettext as _
 from wiki.core.plugins import registry
 from wiki.core.plugins.base import BasePlugin

@@ 1,3 1,1 @@
-from __future__ import unicode_literals
-
 default_app_config = 'wiki.plugins.notifications.apps.NotificationsConfig'

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.apps import AppConfig
 from django.utils.translation import ugettext_lazy as _
 

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django import forms
 from django.contrib.contenttypes.models import ContentType
 from django.forms.models import BaseModelFormSet, modelformset_factory

@@ 1,5 1,3 @@
-from __future__ import absolute_import
-
 from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.models import ContentType
 from django.core.management.base import BaseCommand

@@ 1,6 1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

@@ 1,6 1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 

@@ 1,6 1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.db.models import signals

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 
 # Deprecated
 APP_LABEL = None

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.utils.translation import ugettext as _
 
 

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import redirect

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.conf.urls import url
 from wiki.core.plugins import registry
 from wiki.core.plugins.base import BasePlugin

@@ 1,6 1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import re
 
 from django.apps import apps

@@ 1,6 1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.conf.urls import include, url
 from wiki.conf import settings
 from wiki.core.plugins import registry

@@ 10,8 10,6 @@ SETTINGS.LOGIN_URL
 SETTINGS.LOGOUT_URL
 """
 
-from __future__ import unicode_literals
-
 from django.conf import settings as django_settings
 from django.contrib import messages
 from django.contrib.auth import get_user_model, login as auth_login

@@ 1,6 1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import difflib
 import logging
 

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 import logging
 
 from django.views.generic.base import TemplateResponseMixin