Merge pull request #170 from rambo/autopep8

Automatic code formatting tools

Author: ojousima

project/access/__init__.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-

project/access/admin.py

@@ -1,8 +1,10 @@
+# -*- coding: utf-8 -*-
 from django.contrib import admin
 from django.utils.html import format_html
 from django.utils.translation import ugettext_lazy as _
 from reversion.admin import VersionAdmin
-from .models import TokenType, Token, AccessType, Grant, NonMemberToken
+
+from .models import AccessType, Grant, NonMemberToken, Token, TokenType
 
 
 class TokenTypeAdmin(VersionAdmin):
@@ -14,7 +16,7 @@ class TokenTypeListFilter(admin.SimpleListFilter):
     parameter_name = 'ttype'
 
     def lookups(self, request, model_admin):
-        return ( (x.pk, x.label) for x in TokenType.objects.all() )
+        return ((x.pk, x.label) for x in TokenType.objects.all())
 
     def queryset(self, request, queryset):
         v = self.value()
@@ -28,7 +30,7 @@ class RevokedListFilter(admin.SimpleListFilter):
     parameter_name = 'revoked'
 
     def lookups(self, request, model_admin):
-        return ( ( "-2", _("All")), (None, _("Not revoked")), ("1", _("Revoked")) )
+        return (("-2", _("All")), (None, _("Not revoked")), ("1", _("Revoked")))
 
     def choices(self, cl):
         for lookup, title in self.lookup_choices:
@@ -85,7 +87,7 @@ class AccessTypeListFilter(admin.SimpleListFilter):
     parameter_name = 'atype'
 
     def lookups(self, request, model_admin):
-        return ( (x.pk, x.label) for x in AccessType.objects.all() )
+        return ((x.pk, x.label) for x in AccessType.objects.all())
 
     def queryset(self, request, queryset):
         v = self.value()
@@ -109,6 +111,7 @@ def owner_f(self, obj):
 
 
 class GrantsListFilter(AccessTypeListFilter):
+
     def queryset(self, request, queryset):
         v = self.value()
         if not v:
@@ -127,7 +130,7 @@ class NonMemberTokenAdmin(VersionAdmin):
     list_filter = (GrantsListFilter, TokenTypeListFilter, RevokedListFilter)
 
     def grants_formatted(self, obj):
-        return ', '.join(( x.label for x in obj.grants.all() ))
+        return ', '.join((x.label for x in obj.grants.all()))
     grants_formatted.short_description = _("Grants")
 
     def value_formatted(self, obj):

project/access/management/__init__.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-

project/access/management/commands/__init__.py

@@ -0,0 +1 @@
+# -*- coding: utf-8 -*-

project/access/management/commands/exporttokens.py

@@ -1,6 +1,8 @@
+# -*- coding: utf-8 -*-
 import sqlite3
-from django.core.management.base import BaseCommand, CommandError
+
 from access.utils import all_tokens
+from django.core.management.base import BaseCommand, CommandError
 
 
 class Command(BaseCommand):

project/access/management/commands/generate_accesstypesetc.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
+from access.tests.fixtures import accesstypes, tokentypes
 from django.core.management.base import BaseCommand, CommandError
-from access.tests.fixtures import tokentypes, accesstypes
 
 
 class Command(BaseCommand):

project/access/management/commands/generate_grants.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-from django.core.management.base import BaseCommand, CommandError
 from access.tests.fixtures.grants import GrantFactory
+from django.core.management.base import BaseCommand, CommandError
 
 
 class Command(BaseCommand):

project/access/management/commands/generate_nonmembertokens.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-from django.core.management.base import BaseCommand, CommandError
 from access.tests.fixtures.nonmembertokens import NonMemberTokenFactory
+from django.core.management.base import BaseCommand, CommandError
 
 
 class Command(BaseCommand):

project/access/management/commands/generate_tokens.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-from django.core.management.base import BaseCommand, CommandError
 from access.tests.fixtures.tokens import TokenFactory
+from django.core.management.base import BaseCommand, CommandError
 
 
 class Command(BaseCommand):

project/access/migrations/0002_auto_20151206_1842.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import django_markdown.models
+from django.db import migrations, models
+
 import asylum.mixins