Attacked pep8

misago/admin/__init__.py

@@ -1 +1 @@
-from misago.admin.hierarchy import site # noqa
+from misago.admin.hierarchy import site  # noqa

misago/admin/hierarchy.py

@@ -26,7 +26,8 @@ class Node(object):
     def children_as_dicts(self):
         childrens = []
         for children in self._children:
-            childrens.append({
+            childrens.append(
+                {
                     'link': reverse(children.link),
                     'namespace': self.namespace,
                     'name': children.name,
@@ -101,7 +102,7 @@ class AdminHierarchyBuilder(object):
             iterations += 1
             if iterations > 512:
                 message = ("Misago Admin hierarchy is invalid or too complex "
-                          "to resolve. Nodes left: %s" % self.nodes_record)
+                           "to resolve. Nodes left: %s" % self.nodes_record)
                 raise ValueError(message)
 
             for index, node in enumerate(self.nodes_record):
@@ -140,7 +141,8 @@ class AdminHierarchyBuilder(object):
         if after and before:
             raise ValueError("You cannot use both after and before kwargs.")
 
-        self.nodes_record.append({
+        self.nodes_record.append(
+            {
                 'parent': parent,
                 'namespace': namespace,
                 'after': after,

misago/admin/middleware.py

@@ -1,4 +1,3 @@
-from django.conf import settings
 from django.shortcuts import redirect
 from misago.admin.auth import is_admin_session, update_admin_session
 from misago.admin.views import get_protected_namespace

misago/admin/tests/test_admin_hierarchy.py

@@ -1,5 +1,5 @@
 from django.test import TestCase
-from misago.admin.hierarchy import  Node
+from misago.admin.hierarchy import Node
 
 
 class NodeTests(TestCase):

misago/admin/tests/test_admin_views.py

@@ -24,7 +24,6 @@ class AdminProtectedNamespaceTests(TestCase):
             request = FakeRequest(links_prefix + case)
             self.assertEqual(get_protected_namespace(request), 'misago:admin')
 
-
     def test_invalid_cases(self):
         """get_protected_namespace returns none for other links"""
         TEST_CASES = (

misago/admin/views/__init__.py

@@ -37,11 +37,7 @@ def render(request, template, context=None):
     except IndexError:
         pages = []
 
-    context.update({
-            'sections': sections,
-            'actions': actions,
-            'pages': pages
-        })
+    context.update({'sections': sections, 'actions': actions, 'pages': pages})
 
     return dj_render(request, template, context)
 

misago/admin/views/auth.py

@@ -1,5 +1,4 @@
 from django.contrib import messages
-from django.http import Http404
 from django.shortcuts import render, redirect
 from django.utils.translation import ugettext as _
 from django.views.decorators.debug import sensitive_post_parameters

misago/conf/forms.py

@@ -146,7 +146,7 @@ def ChangeSettingsForm(data=None, group=None):
     fieldset_fields = False
     for setting in group.setting_set.order_by('order'):
         if setting.legend and setting.legend != fieldset_legend:
-            if fieldset_fields != False:
+            if fieldset_fields:
                 fieldsets.append(
                     {'legend': fieldset_legend, 'form': fieldset_form(data)})
             fieldset_legend = setting.legend

misago/conf/migrationutils.py

@@ -37,6 +37,47 @@ def get_group(orm, group_key):
         return orm['conf.SettingsGroup']()
 
 
+def migrate_setting(orm, group, setting_fixture, order, value):
+    setting_fixture['group'] = group
+    setting_fixture['order'] = order
+
+    setting_fixture['name'] = original_message(setting_fixture['name'])
+    if setting_fixture.get('description'):
+        setting_fixture['description'] = original_message(
+            setting_fixture.get('description'))
+
+    if (setting_fixture.get('field_extra') and
+            setting_fixture.get('field_extra').get('choices')):
+        untranslated_choices = setting_fixture['field_extra']['choices']
+        if untranslated_choices == '#TZ#':
+            setting_fixture['field_extra']['choices'] = '#TZ#'
+        else:
+            translated_choices = []
+            for value, name in untranslated_choices:
+                translated_choices.append((value, original_message(name)))
+            setting_fixture['field_extra']['choices'] = tuple(
+                translated_choices)
+
+    if not value:
+        value = setting_fixture.pop('value', None)
+    setting_fixture.pop('value', None)
+
+    field_extra = setting_fixture.pop('field_extra', None)
+
+    setting = orm['conf.Setting'](**setting_fixture)
+    setting.dry_value = dehydrate_value(setting.python_type, value)
+
+    if setting_fixture.get("default_value"):
+        setting.default_value = dehydrate_value(
+            setting.python_type, setting_fixture.get("default_value"))
+
+    if field_extra:
+        pickled_extra = pickle.dumps(field_extra, pickle.HIGHEST_PROTOCOL)
+        setting.pickled_field_extra = base64.encodestring(pickled_extra)
+
+    setting.save()
+
+
 def migrate_settings_group(orm, group_fixture, old_group_key=None):
     group_key = group_fixture['key']
 
@@ -66,47 +107,8 @@ def migrate_settings_group(orm, group_fixture, old_group_key=None):
     group.setting_set.all().delete()
 
     for order, setting_fixture in enumerate(group_fixture['settings']):
-        setting_fixture['group'] = group
-        setting_fixture['order'] = order
-
-        setting_fixture['name'] = original_message(setting_fixture['name'])
-        if setting_fixture.get('description'):
-            setting_fixture['description'] = original_message(
-                setting_fixture.get('description'))
-
-        if (setting_fixture.get('field_extra') and
-                setting_fixture.get('field_extra').get('choices')):
-            untranslated_choices = setting_fixture['field_extra']['choices']
-            if untranslated_choices == '#TZ#':
-                setting_fixture['field_extra']['choices'] = '#TZ#'
-            else:
-                translated_choices = []
-                for value, name in untranslated_choices:
-                    translated_choices.append((value, original_message(name)))
-                setting_fixture['field_extra']['choices'] = tuple(
-                    translated_choices)
-
-        try:
-            value = custom_settings_values[setting_fixture['setting']]
-        except KeyError:
-            value = setting_fixture.pop('value', None)
-        finally:
-            setting_fixture.pop('value', None)
-
-        field_extra = setting_fixture.pop('field_extra', None)
-
-        setting = orm['conf.Setting'](**setting_fixture)
-        setting.dry_value = dehydrate_value(setting.python_type, value)
-
-        if setting_fixture.get("default_value"):
-            setting.default_value = dehydrate_value(
-                setting.python_type, setting_fixture.get("default_value"))
-
-        if field_extra:
-            pickled_extra = pickle.dumps(field_extra, pickle.HIGHEST_PROTOCOL)
-            setting.pickled_field_extra = base64.encodestring(pickled_extra)
-
-        setting.save()
+        migrate_setting(orm, group, setting_fixture, order,
+                        custom_settings_values.pop(setting_fixture['name']))
 
 
 def delete_settings_cache():

misago/conf/urls.py

@@ -1,4 +1,3 @@
-from django.conf import settings
 from django.conf.urls import patterns, include, url
 
 

misago/core/tests/test_decorators.py

@@ -1,7 +1,6 @@
 from django.contrib.auth import get_user_model
 from django.core.urlresolvers import reverse
-from django.test import Client, TestCase
-from misago.core.decorators import require_POST
+from django.test import TestCase
 
 
 class RequirePostTests(TestCase):

misago/core/timezones.py

@@ -1,5 +1,4 @@
 import datetime
-from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
 import pytz
 
@@ -86,6 +85,6 @@ def choices():
             else:
                 ready_list.append((tz[0], tz[1]))
         else:
-           ready_list.append(tz)
+            ready_list.append(tz)
 
     return tuple(ready_list)

misago/users/management/commands/createsuperuser.py

@@ -6,7 +6,7 @@ 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, CommandError
+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
@@ -26,18 +26,23 @@ class Command(BaseCommand):
 
         self.option_list = BaseCommand.option_list + (
             make_option('--username', dest='username', default=None,
-                help='Specifies the username for the superuser.'),
+                        help='Specifies the username for the superuser.'),
             make_option('--email', dest='email', default=None,
-                help='Specifies the username for the superuser.'),
+                        help='Specifies the username for the superuser.'),
             make_option('--password', dest='password', default=None,
-                help='Specifies the username for the superuser.'),
-            make_option('--noinput', action='store_false', dest='interactive', default=True,
-                help=('Tells Miago to NOT prompt the user for input of any kind. '
-                      'You must use --username with --noinput, along with an option for '
-                      'any other required field. Superusers created with --noinput will '
-                      ' not be able to log in until they\'re given a valid password.')),
+                        help='Specifies the username for the superuser.'),
+            make_option('--noinput', action='store_false', dest='interactive',
+                        default=True,
+                        help=('Tells Miago to NOT prompt the user for input '
+                              'of any kind. You must use --username with '
+                              '--noinput, along with an option for any other '
+                              'required field. Superusers created with '
+                              '--noinput will  not be able to log in until '
+                              'they\'re given a valid password.')),
             make_option('--database', action='store', dest='database',
-                default=DEFAULT_DB_ALIAS, help='Specifies the database to use. Default is "default".'),
+                        default=DEFAULT_DB_ALIAS,
+                        help=('Specifies the database to use. '
+                              'Default is "default".')),
         )
 
     def execute(self, *args, **options):

misago/users/models/usermodel.py

@@ -1,4 +1,3 @@
-from django.core.exceptions import ValidationError
 from django.contrib.auth.models import (AbstractBaseUser, PermissionsMixin,
                                         UserManager as BaseUserManager)
 from django.db import models

misago/users/tests/test_decorators.py

@@ -1,7 +1,6 @@
 from django.contrib.auth import get_user_model
 from django.core.urlresolvers import reverse
-from django.test import Client, TestCase
-from misago.users.decorators import deny_authenticated, deny_guests
+from django.test import TestCase
 
 
 class DenyAuthenticatedTests(TestCase):

misago/users/tests/test_user_model.py

@@ -17,9 +17,9 @@ class UserManagerTests(TestCase):
 
     def test_create_user_twice(self):
         """create_user is raising validation error for duplicate users"""
-        user = User.objects.create_user('Bob', 'bob@test.com', 'Pass.123')
+        User.objects.create_user('Bob', 'bob@test.com', 'Pass.123')
         with self.assertRaises(ValidationError):
-            user = User.objects.create_user('Bob', 'bob@test.com', 'Pass.123')
+            User.objects.create_user('Bob', 'bob@test.com', 'Pass.123')
 
     def test_create_superuser(self):
         """create_superuser created new user account successfully"""