30 files changed, 0 insertions(+), 61 deletions(-)

M testproject/manage.py
M testproject/testproject/settings/__init__.py
M testproject/testproject/settings/base.py
M testproject/testproject/settings/codehilite.py
M testproject/testproject/settings/customauthuser.py
M testproject/testproject/settings/haystack.py
M testproject/testproject/settings/sendfile.py
M testproject/testproject/urls.py
M testproject/testproject/wsgi.py
M tests/base.py
M tests/core/test_accounts.py
M tests/core/test_basic.py
M tests/core/test_commands.py
M tests/core/test_managers.py
M tests/core/test_markdown.py
M tests/core/test_models.py
M tests/core/test_template_filters.py
M tests/core/test_template_tags.py
M tests/core/test_urls.py
M tests/core/test_views.py
M tests/plugins/attachments/test_commands.py
M tests/plugins/attachments/test_views.py
M tests/plugins/globalhistory/__init__.py
M tests/plugins/globalhistory/test_globalhistory.py
M tests/plugins/images/__init__.py
M tests/plugins/images/test_views.py
M tests/plugins/links/test_links.py
M tests/plugins/macros/test_toc.py
M tests/testdata/models.py
M tests/testdata/urls.py

@@ 1,6 1,4 @@
 #!/usr/bin/env python
-from __future__ import unicode_literals
-
 import os
 import sys
 

@@ 1,6 1,3 @@
-from __future__ import unicode_literals, absolute_import
-
-
 try:
     from .local import *
 except ImportError:

@@ 8,8 8,6 @@ For the full list of settings and their values, see
 https://docs.djangoproject.com/en/1.9/ref/settings/
 """
 
-from __future__ import unicode_literals
-
 import os
 
 from django.core.urlresolvers import reverse_lazy

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from testproject.settings import *
 from testproject.settings.local import *
 

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 import os  # noqa @UnusedImport
 
 from .base import *  # noqa @UnusedWildImport

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from .base import *  # noqa @UnusedWildImport
 
 

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from .base import *  # noqa @UnusedWildImport
 
 

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.conf.urls import include, url
 from django.contrib import admin

@@ 13,8 13,6 @@ middleware here, or combine a Django application with an application of another
 framework.
 
 """
-from __future__ import unicode_literals
-
 import os
 import sys
 

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 import os
 import unittest
 

@@ 1,6 1,3 @@
-from __future__ import print_function, unicode_literals
-
-
 from django.conf import settings as django_settings
 from django.contrib.auth import authenticate
 from django.shortcuts import resolve_url

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

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 import os
 import sys
 import tempfile

@@ 4,8 4,6 @@ because the pattern of building them is different from Django
 1.5 to 1.6 to 1.7 so there will be 3 patterns in play at the
 same time.
 """
-from __future__ import print_function, unicode_literals
-
 from wiki.models import Article, URLPath
 from wiki.plugins.attachments.models import Attachment
 

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 import markdown
 from django.test import TestCase
 from mock import patch

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.apps import apps
 from django.conf.urls import url
 from django.contrib.auth import get_user_model

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.contrib.auth import get_user_model
 from wiki.models import Article, ArticleRevision
 from wiki.templatetags.wiki_tags import (can_delete, can_moderate, can_read,

@@ 1,9 1,6 @@
 """
 Almost all test cases covers both tag calling and template using.
 """
-
-from __future__ import print_function, unicode_literals
-
 from django.conf import settings as django_settings
 from django.contrib.contenttypes.models import ContentType
 from django.http import HttpRequest

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.conf.urls import url
 from django.contrib.auth import get_user_model
 from django.contrib.sites.models import Site

@@ 1,5 1,3 @@
-from __future__ import print_function, unicode_literals
-
 import pprint
 
 from django.contrib.auth import authenticate

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 import os
 import tempfile
 

@@ 1,5 1,3 @@
-from __future__ import print_function, unicode_literals
-
 from io import BytesIO
 
 from django.core.files.uploadedfile import InMemoryUploadedFile

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

@@ 1,5 1,3 @@
-from __future__ import print_function, unicode_literals
-
 from django.core.urlresolvers import reverse
 from wiki.models import URLPath
 

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

@@ 1,5 1,3 @@
-from __future__ import print_function, unicode_literals
-
 import base64
 from io import BytesIO
 

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 import markdown
 from django.core.urlresolvers import reverse_lazy
 from django.test import TestCase

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 import markdown
 from django.test import TestCase
 from wiki.plugins.macros.mdx.toc import WikiTocExtension

@@ 1,5 1,3 @@
-from __future__ import absolute_import
-
 from django.contrib.auth.models import AbstractUser
 from django.db import models
 

@@ 1,5 1,3 @@
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.conf.urls import include, url
 from django.contrib import admin