cleaned imports

misago/acl/api.py

@@ -1,5 +1,6 @@
 from misago.core import threadstore
 from misago.core.cache import cache
+
 from misago.acl import version
 from misago.acl.builder import build_acl
 from misago.acl.providers import providers

misago/acl/forms.py

@@ -1,5 +1,7 @@
 from django.utils.translation import ugettext_lazy as _
+
 from misago.core import forms
+
 from misago.acl.models import Role
 from misago.acl.providers import providers
 

misago/acl/migrations/0002_acl_version_tracker.py

@@ -2,6 +2,7 @@
 from __future__ import unicode_literals
 
 from django.db import models, migrations
+
 from misago.core.migrationutils import cachebuster_register_cache
 
 

misago/acl/migrations/0003_default_roles.py

@@ -1,14 +1,15 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
-from django.utils.translation import ugettext as _
 import base64
 try:
     import cPickle as pickle
 except ImportError:
     import pickle
 
+from django.db import models, migrations
+from django.utils.translation import ugettext as _
+
 
 def pickle_permissions(role, permissions):
     role.pickled_permissions = base64.encodestring(

misago/acl/models.py

@@ -1,11 +1,13 @@
-from django.db import models
-from misago.acl import version as acl_version
 import base64
 try:
     import cPickle as pickle
 except ImportError:
     import pickle
 
+from django.db import models
+
+from misago.acl import version as acl_version
+
 
 class BaseRole(models.Model):
     name = models.CharField(max_length=255)

misago/acl/panels.py

@@ -1,6 +1,6 @@
+from debug_toolbar.panels import Panel
 from django.template.loader import render_to_string
 from django.utils.translation import ugettext_lazy as _
-from debug_toolbar.panels import Panel
 
 
 class MisagoACLPanel(Panel):

misago/acl/tests/test_api.py

@@ -1,6 +1,6 @@
 from django.test import TestCase
-from misago.acl.api import get_user_acl
 from misago.users.models import User, AnonymousUser
+from misago.acl.api import get_user_acl
 
 
 class GetUserACLTests(TestCase):

misago/acl/tests/test_providers.py

@@ -1,6 +1,8 @@
 from types import ModuleType
+
 from django.conf import settings
 from django.test import TestCase
+
 from misago.acl.providers import PermissionProviders
 
 

misago/acl/tests/test_roleadmin_views.py

@@ -1,5 +1,7 @@
 from django.core.urlresolvers import reverse
+
 from misago.admin.testutils import AdminTestCase
+
 from misago.acl.models import Role
 from misago.acl.testutils import fake_post_data
 

misago/acl/tests/test_testutils.py

@@ -1,4 +1,5 @@
 from django.test import TestCase
+
 from misago.acl.models import Role
 from misago.acl.testutils import fake_post_data
 

misago/acl/views.py

@@ -1,7 +1,9 @@
 from django.contrib import messages
 from django.shortcuts import redirect
 from django.utils.translation import ugettext_lazy as _
+
 from misago.admin.views import generic
+
 from misago.acl.forms import RoleForm, get_permissions_forms
 from misago.acl.models import Role
 

misago/admin/auth.py

@@ -1,5 +1,6 @@
 from hashlib import md5
 from time import time
+
 from django.conf import settings
 from django.contrib import auth as dj_auth, messages
 from django.utils.translation import ugettext as _

misago/admin/discoverer.py

@@ -1,5 +1,7 @@
 from importlib import import_module
+
 from django.apps import apps
+
 from misago.admin.hierarchy import site
 from misago.admin.urlpatterns import urlpatterns
 

misago/admin/middleware.py

@@ -1,4 +1,5 @@
 from django.shortcuts import redirect
+
 from misago.admin.auth import is_admin_session, update_admin_session
 from misago.admin.views import get_protected_namespace
 from misago.admin.views.auth import login

misago/admin/tests/test_admin_views.py

@@ -1,6 +1,7 @@
 from django.contrib.auth import get_user_model
 from django.core.urlresolvers import reverse
 from django.test import TestCase
+
 from misago.admin.testutils import admin_login
 from misago.admin.views import get_protected_namespace
 

misago/admin/urls.py

@@ -1,6 +1,8 @@
 import importlib
+
 from django.conf import settings
 from django.conf.urls import patterns, include, url
+
 from misago import admin
 
 

misago/admin/views/__init__.py

@@ -1,6 +1,7 @@
 from django.conf import settings
 from django.core.urlresolvers import reverse, NoReverseMatch
 from django.shortcuts import render as dj_render
+
 from misago.admin import site
 from misago.admin.auth import is_admin_session, update_admin_session
 from misago.admin.views.auth import login

misago/admin/views/auth.py

@@ -4,9 +4,11 @@ from django.utils.translation import ugettext as _
 from django.views.decorators.debug import sensitive_post_parameters
 from django.views.decorators.cache import never_cache
 from django.views.decorators.csrf import csrf_protect
-from misago.admin import auth
+
 from misago.users.forms.auth import AdminAuthenticationForm
 
+from misago.admin import auth
+
 
 @sensitive_post_parameters()
 @csrf_protect

misago/admin/views/generic/formsbuttons.py

@@ -1,6 +1,7 @@
 from django.contrib import messages
 from django.db import transaction
 from django.shortcuts import redirect
+
 from misago.admin.views.generic.base import AdminView
 
 

misago/admin/views/generic/list.py

@@ -1,11 +1,14 @@
 from urllib import urlencode
+
 from django.contrib import messages
 from django.core.paginator import Paginator, EmptyPage
 from django.core.urlresolvers import reverse
 from django.db import transaction
 from django.shortcuts import redirect
 from django.utils.translation import ugettext_lazy as _
+
 from misago.core.exceptions import ExplicitFirstPage
+
 from misago.admin.views.generic.base import AdminView
 
 

misago/conf/migrationutils.py

@@ -1,12 +1,14 @@
 import base64
-from importlib import import_module
-from misago.conf.dbsettings import CACHE_KEY
-from misago.conf.hydrators import dehydrate_value
-from misago.core.cache import cache as default_cache
 try:
     import cPickle as pickle
 except ImportError:
     import pickle
+from importlib import import_module
+
+from misago.core.cache import cache as default_cache
+
+from misago.conf.dbsettings import CACHE_KEY
+from misago.conf.hydrators import dehydrate_value
 
 
 def get_group(SettingsGroup, group_key):

misago/conf/models.py

@@ -1,11 +1,13 @@
 import base64
-from django.db import models
-from misago.conf import hydrators
 try:
     import cPickle as pickle
 except ImportError:
     import pickle
 
+from django.db import models
+
+from misago.conf import hydrators
+
 
 class SettingsGroupsManager(models.Manager):
     def ordered_alphabetically(self):

misago/conf/tests/test_admin_views.py

@@ -1,6 +1,8 @@
 from django.contrib.auth import get_user_model
 from django.core.urlresolvers import reverse
+
 from misago.admin.testutils import AdminTestCase
+
 from misago.conf.models import SettingsGroup
 
 

misago/conf/tests/test_context_processors.py

@@ -1,5 +1,7 @@
 from django.test import TestCase
+
 from misago.core import threadstore
+
 from misago.conf.context_processors import settings
 from misago.conf.dbsettings import db_settings
 

misago/conf/tests/test_migrationutils.py

@@ -1,6 +1,8 @@
 from django.apps import apps
 from django.test import TestCase
+
 from misago.core import threadstore
+
 from misago.conf import migrationutils
 from misago.conf.models import SettingsGroup, Setting
 

misago/conf/tests/test_settings.py

@@ -1,7 +1,9 @@
 from django.apps import apps
 from django.conf import settings as dj_settings
 from django.test import TestCase
+
 from misago.core import threadstore
+
 from misago.conf.gateway import settings as gateway
 from misago.conf.dbsettings import db_settings
 from misago.conf.migrationutils import migrate_settings_group

misago/conf/views.py

@@ -1,7 +1,9 @@
 from django.contrib import messages
 from django.shortcuts import redirect
 from django.utils.translation import ugettext as _
+
 from misago.admin.views import render as mi_render
+
 from misago.conf import db_settings
 from misago.conf.forms import ChangeSettingsForm
 from misago.conf.models import SettingsGroup, Setting

misago/core/exceptionhandler.py

@@ -1,6 +1,7 @@
 from django.core.exceptions import PermissionDenied
 from django.core.urlresolvers import reverse
 from django.http import Http404, HttpResponsePermanentRedirect
+
 from misago.core import errorpages
 from misago.core.exceptions import ExplicitFirstPage, OutdatedSlug
 

misago/core/forms.py

@@ -1,7 +1,7 @@
+from crispy_forms.helper import FormHelper
 from django.utils.translation import ugettext_lazy as _
 from django.forms import *  # noqa
 from django.forms import Form as BaseForm, ModelForm as BaseModelForm
-from crispy_forms.helper import FormHelper
 
 
 TEXT_BASED_FIELDS = (

misago/core/migrations/0002_basic_settings.py

@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 
 from django.db import models, migrations
 from django.utils.translation import ugettext as _
+
 from misago.conf.migrationutils import migrate_settings_group
 
 

misago/core/migrationutils.py

@@ -1,4 +1,5 @@
 from importlib import import_module
+
 from misago.core.cache import cache as default_cache
 from misago.core.cachebuster import CACHE_KEY
 

misago/core/setup.py

@@ -1,6 +1,7 @@
 import re
 import os
 from optparse import OptionParser
+
 from django.core import management
 
 

misago/core/templatetags/misago_forms.py

@@ -1,7 +1,8 @@
+from crispy_forms.templatetags import crispy_forms_field, crispy_forms_filters
+
 from django import template
 from django.template import Context
 from django.template.loader import get_template
-from crispy_forms.templatetags import crispy_forms_field, crispy_forms_filters
 
 
 register = template.Library()

misago/core/testproject/urls.py

@@ -1,5 +1,6 @@
 from django.conf.urls import patterns, include, url
 
+
 urlpatterns = patterns('',
     url(r'^forum/', include('misago.urls', namespace='misago')),
 )

misago/core/testproject/urlswitherrorhandlers.py

@@ -1,4 +1,5 @@
 from misago.core.testproject.urls import *
 
+
 handler403 = 'misago.core.testproject.views.mock_custom_403_error_page'
 handler404 = 'misago.core.testproject.views.mock_custom_404_error_page'

misago/core/testproject/views.py

@@ -1,6 +1,7 @@
 from django.contrib.auth import get_user_model
 from django.core.exceptions import PermissionDenied
 from django.http import Http404, HttpResponse
+
 from misago.core import errorpages, mail
 from misago.core.shortcuts import paginate, validate_slug
 from misago.core.testproject.models import Model

misago/core/tests/test_cachebuster.py

@@ -1,4 +1,5 @@
 from django.test import TestCase
+
 from misago.core import cachebuster
 from misago.core import threadstore
 from misago.core.models import CacheVersion

misago/core/tests/test_errorpages.py

@@ -1,6 +1,7 @@
 from django.core.urlresolvers import reverse
 from django.test import Client, TestCase
 from django.test.client import RequestFactory
+
 from misago.core.testproject.views import (mock_custom_403_error_page,
                                            mock_custom_404_error_page)
 

misago/core/tests/test_middleware_exceptionhandler.py

@@ -2,6 +2,7 @@ from django.core.urlresolvers import reverse
 from django.http import Http404
 from django.test import TestCase
 from django.test.client import RequestFactory
+
 from misago.core.middleware.exceptionhandler import ExceptionHandlerMiddleware
 
 

misago/core/tests/test_migrationutils.py

@@ -1,5 +1,6 @@
 from django.apps import apps
 from django.test import TestCase
+
 from misago.core import migrationutils
 from misago.core.models import CacheVersion
 

misago/core/tests/test_setup.py

@@ -1,4 +1,5 @@
 import os
+
 from django.test import TestCase
 from misago.core import setup
 

misago/core/tests/test_threadstore.py

@@ -1,6 +1,7 @@
 from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.test.client import RequestFactory
+
 from misago.core.middleware.threadstore import ThreadStoreMiddleware
 from misago.core import threadstore
 

misago/core/tests/test_utils.py

@@ -2,6 +2,7 @@
 from django.core.urlresolvers import reverse
 from django.test import TestCase
 from django.test.client import RequestFactory
+
 from misago.core.utils import is_request_to_misago, slugify, time_amount
 
 

misago/core/timezones.py

@@ -1,4 +1,5 @@
 import datetime
+
 from django.utils.translation import ugettext_lazy as _
 import pytz
 

misago/faker/management/commands/createfakebans.py

@@ -1,11 +1,12 @@
 import random
 from datetime import timedelta
-from faker import Factory
+
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ValidationError
 from django.core.management.base import BaseCommand
 from django.db import IntegrityError
 from django.utils import timezone
+from faker import Factory
 from misago.users.models import Ban, BAN_USERNAME, BAN_EMAIL, BAN_IP
 
 

misago/faker/management/commands/createfakeusers.py

@@ -1,9 +1,10 @@
 import random
-from faker import Factory
+
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ValidationError
 from django.core.management.base import BaseCommand
 from django.db import IntegrityError
+from faker import Factory
 from misago.users.models import Rank
 
 

misago/forums/admin.py

@@ -1,5 +1,6 @@
 from django.conf.urls import url
 from django.utils.translation import ugettext_lazy as _
+
 from misago.forums.views.forumsadmin import (ForumsList, NewForum, EditForum,
                                              MoveDownForum, MoveUpForum,
                                              DeleteForum)

misago/forums/forms.py

@@ -2,8 +2,10 @@ from django.db import models
 from django.utils.html import conditional_escape, mark_safe
 from django.utils.translation import ugettext_lazy as _
 from mptt.forms import TreeNodeChoiceField as TreeNodeChoiceField
+
 from misago.core import forms
 from misago.core.validators import validate_sluggable
+
 from misago.forums.models import Forum, ForumRole
 
 

misago/forums/migrations/0002_default_forums.py

@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 
 from django.db import models, migrations
 from django.utils.translation import ugettext as _
+
 from misago.core.utils import slugify
 
 

misago/forums/migrations/0003_forums_roles.py

@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
-from django.utils.translation import ugettext as _
 import base64
 try:
     import cPickle as pickle
 except ImportError:
     import pickle
 
+from django.db import models, migrations
+from django.utils.translation import ugettext as _
 
 def pickle_permissions(role, permissions):
     role.pickled_permissions = base64.encodestring(

misago/forums/models.py

@@ -2,6 +2,7 @@ from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from mptt.managers import TreeManager
 from mptt.models import MPTTModel, TreeForeignKey
+
 from misago.acl import version as acl_version
 from misago.acl.models import BaseRole
 from misago.core.utils import subset_markdown, slugify

misago/forums/tests/test_permissions_admin_views.py

@@ -1,7 +1,9 @@
 from django.core.urlresolvers import reverse
+
 from misago.acl.models import Role
 from misago.acl.testutils import fake_post_data
 from misago.admin.testutils import AdminTestCase
+
 from misago.forums.models import Forum, ForumRole
 
 

misago/forums/views/forumsadmin.py

@@ -1,9 +1,12 @@
 import warnings
+
 from django.contrib import messages
 from django.shortcuts import redirect
 from django.utils.translation import ugettext_lazy as _
+
 from misago.admin.views import generic
 from misago.acl import version as acl_version
+
 from misago.forums.models import FORUMS_TREE_ID, Forum, RoleForumACL
 from misago.forums.forms import ForumFormFactory, DeleteFormFactory
 

misago/forums/views/permsadmin.py

@@ -1,11 +1,13 @@
 from django.contrib import messages
 from django.shortcuts import redirect
 from django.utils.translation import ugettext_lazy as _
+
 from misago.admin.views import generic
 from misago.acl import version as acl_version
 from misago.acl.forms import get_permissions_forms
 from misago.acl.models import Role
 from misago.acl.views import RoleAdmin, RolesList
+
 from misago.forums.forms import (ForumRoleForm, ForumRolesACLFormFactory,
                                  RoleForumACLFormFactory)
 from misago.forums.views.forumsadmin import ForumAdmin, ForumsList

misago/users/admin.py

@@ -1,5 +1,6 @@
 from django.conf.urls import url
 from django.utils.translation import ugettext_lazy as _
+
 from misago.users.views.admin.bans import BansList, NewBan, EditBan, DeleteBan
 from misago.users.views.admin.ranks import (RanksList, NewRank, EditRank,
                                             DeleteRank, MoveDownRank,

misago/users/forms/admin.py

@@ -1,8 +1,10 @@
 from django.contrib.auth import get_user_model
 from django.utils.translation import ugettext_lazy as _
+
 from misago.core import forms, threadstore
 from misago.core.validators import validate_sluggable
 from misago.acl.models import Role
+
 from misago.users.models import (BANS_CHOICES, RESTRICTIONS_CHOICES,
                                  Ban, Rank, WarningLevel)
 from misago.users.validators import (validate_username, validate_email,

misago/users/forms/auth.py

@@ -3,6 +3,7 @@ from django.contrib.auth import authenticate
 from django.contrib.auth.forms import (AuthenticationForm as
                                        BaseAuthenticationForm)
 from django.utils.translation import ugettext_lazy as _
+
 from misago.core import forms
 
 

misago/users/management/commands/bansmaintenance.py

@@ -1,6 +1,8 @@
 from django.core.management.base import BaseCommand
 from django.utils import timezone
+
 from misago.core import cachebuster
+
 from misago.users.models import BanCache
 
 

misago/users/management/commands/createsuperuser.py

@@ -5,12 +5,14 @@ works with double authentication fields on user model
 from getpass import getpass
 from optparse import make_option
 import sys
+
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ValidationError
 from django.core.management.base import BaseCommand
 from django.db import DEFAULT_DB_ALIAS, IntegrityError
 from django.utils.encoding import force_str
 from django.utils.six.moves import input
+
 from misago.users.validators import (validate_email, validate_username,
                                      validate_password)
 

misago/users/migrations/0001_initial.py

@@ -5,6 +5,7 @@ from django.db import models, migrations
 import django.utils.timezone
 import django.db.models.deletion
 from django.conf import settings
+
 from misago.core.pgutils import CreatePartialIndex
 
 

misago/users/migrations/0002_users_settings.py

@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 
 from django.db import models, migrations
 from django.utils.translation import ugettext as _
+
 from misago.conf.migrationutils import migrate_settings_group
 
 

misago/users/migrations/0004_default_ranks.py

@@ -3,6 +3,7 @@ from __future__ import unicode_literals
 
 from django.db import models, migrations
 from django.utils.translation import ugettext as _
+
 from misago.core.utils import slugify
 
 

misago/users/models/bans.py

@@ -4,6 +4,7 @@ from django.conf import settings
 from django.db import models
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
+
 from misago.core.utils import time_amount
 
 

misago/users/models/rank.py

@@ -1,4 +1,5 @@
 from django.db import models, transaction
+
 from misago.acl import version as acl_version
 from misago.core.cache import cache
 from misago.core.utils import slugify

misago/users/models/user.py

@@ -6,9 +6,11 @@ from django.contrib.auth.models import (AbstractBaseUser, PermissionsMixin,
 from django.db import models, transaction
 from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
+
 from misago.acl import get_user_acl
 from misago.acl.models import Role
 from misago.core.utils import slugify
+
 from misago.users.models.rank import Rank
 from misago.users.utils import hash_email
 from misago.users.validators import (validate_email, validate_password,

misago/users/models/warnings.py

@@ -1,5 +1,6 @@
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
+
 from misago.core.cache import cache
 from misago.core.utils import time_amount
 

misago/users/permissions/account.py

@@ -1,4 +1,5 @@
 from django.utils.translation import ugettext_lazy as _
+
 from misago.acl import algebra
 from misago.acl.models import Role
 from misago.core import forms

misago/users/permissions/destroying.py

@@ -1,4 +1,5 @@
 from django.utils.translation import ugettext_lazy as _
+
 from misago.acl import algebra
 from misago.acl.models import Role
 from misago.core import forms

misago/users/permissions/profiles.py

@@ -1,4 +1,5 @@
 from django.utils.translation import ugettext_lazy as _
+
 from misago.acl import algebra
 from misago.acl.models import Role
 from misago.core import forms

misago/users/templatetags/misago_avatars.py

@@ -1,4 +1,5 @@
 import hashlib
+
 from django import template
 
 

misago/users/tests/test_banadmin_views.py

@@ -1,6 +1,9 @@
 from datetime import date
+
 from django.core.urlresolvers import reverse
+
 from misago.admin.testutils import AdminTestCase
+
 from misago.users.models import Ban
 
 

misago/users/tests/test_rankadmin_views.py

@@ -1,4 +1,5 @@
 from django.core.urlresolvers import reverse
+
 from misago.admin.testutils import AdminTestCase
 from misago.acl.models import Role
 from misago.users.models import Rank

misago/users/tests/test_validators.py

@@ -2,7 +2,9 @@
 from django.contrib.auth import get_user_model
 from django.core.exceptions import ValidationError
 from django.test import TestCase
+
 from misago.conf import settings
+
 from misago.users.models import Ban, BAN_USERNAME, BAN_EMAIL
 from misago.users.validators import (validate_email,
                                      validate_email_available,

misago/users/validators.py

@@ -1,8 +1,10 @@
 import re
+
 from django.core.exceptions import ValidationError
 from django.core.validators import validate_email as validate_email_content
 from django.utils.translation import ungettext, ugettext_lazy as _
 from django.contrib.auth import get_user_model
+
 from misago.conf import settings
 
 

misago/users/views/admin/bans.py

@@ -1,7 +1,9 @@
 from django.contrib import messages
 from django.utils.translation import ugettext_lazy as _
+
 from misago.admin.views import generic
 from misago.core import cachebuster
+
 from misago.users.models import Ban
 from misago.users.forms.admin import SearchBansForm, BanForm
 

misago/users/views/admin/ranks.py

@@ -1,6 +1,8 @@
 from django.contrib import messages
 from django.utils.translation import ugettext_lazy as _
+
 from misago.admin.views import generic
+
 from misago.users.models import Rank
 from misago.users.forms.admin import RankForm
 

misago/users/views/admin/users.py

@@ -2,7 +2,9 @@ from django.contrib import messages
 from django.contrib.auth import get_user_model
 from django.shortcuts import redirect
 from django.utils.translation import ugettext_lazy as _
+
 from misago.admin.views import generic
+
 from misago.users.forms.admin import (StaffFlagUserFormFactory, NewUserForm,
                                       EditUserForm, SearchUsersForm)
 

misago/users/views/admin/warnings.py

@@ -1,7 +1,9 @@
 from django.contrib import messages
 from django.utils.translation import ugettext_lazy as _
+
 from misago.admin.views import generic
 from misago.core import cachebuster
+
 from misago.users.models import WarningLevel
 from misago.users.forms.admin import WarningLevelForm
 

misago/users/views/auth.py

@@ -6,7 +6,9 @@ from django.utils.translation import ugettext as _
 from django.views.decorators.debug import sensitive_post_parameters
 from django.views.decorators.cache import never_cache
 from django.views.decorators.csrf import csrf_protect
+
 from misago.core.decorators import require_POST
+
 from misago.users.decorators import deny_authenticated, deny_guests
 from misago.users.forms.auth import AuthenticationForm