From 92ea48f89d0eab24e4761e726cbf564a1bd9a004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89lie=20Bouttier?= Date: Sat, 30 Aug 2014 17:47:19 -0700 Subject: [PATCH] pep8 --- accounts/forms.py | 6 ++--- accounts/models.py | 8 +++---- accounts/views.py | 33 +++++++++++++++------------ permissions/forms.py | 8 +++---- permissions/models.py | 6 ++--- permissions/signals.py | 1 + ponytracker/local_settings.py.example | 14 ++++++------ ponytracker/settings.py | 11 +++++---- tox.ini | 4 ++-- tracker/forms.py | 3 ++- tracker/middleware.py | 2 +- tracker/models.py | 6 ++--- 12 files changed, 55 insertions(+), 47 deletions(-) diff --git a/accounts/forms.py b/accounts/forms.py index a766905..b037d0c 100644 --- a/accounts/forms.py +++ b/accounts/forms.py @@ -4,12 +4,12 @@ from django.forms.widgets import PasswordInput from accounts.models import * -__all__ = [ 'UserForm', 'GroupForm', 'TeamForm' ] +__all__ = ['UserForm', 'GroupForm', 'TeamForm'] UserForm = modelform_factory(User, - fields=['username', 'first_name', 'last_name', - 'password', 'email', 'is_superuser'], + fields=['username', 'first_name', + 'last_name', 'password', 'email', 'is_superuser'], widgets={'password': PasswordInput}) GroupForm = modelform_factory(Group, fields=['name']) diff --git a/accounts/models.py b/accounts/models.py index e09e527..5f2913c 100644 --- a/accounts/models.py +++ b/accounts/models.py @@ -5,14 +5,14 @@ from django.contrib import auth from django.utils.encoding import python_2_unicode_compatible -__all__ = [ 'User', 'Group', 'Team' ] +__all__ = ['User', 'Group', 'Team'] @python_2_unicode_compatible class User(AbstractUser): class Meta: - ordering = [ 'username' ] + ordering = ['username'] @property def teams(self): @@ -45,7 +45,7 @@ class User(AbstractUser): class Group(auth.models.Group): class Meta: - ordering = [ 'name' ] + ordering = ['name'] proxy = True @property @@ -57,7 +57,7 @@ class Group(auth.models.Group): class Team(models.Model): class Meta: - ordering = [ 'name' ] + ordering = ['name'] name = models.CharField(max_length=128, unique=True) diff --git a/accounts/views.py b/accounts/views.py index d247315..060339f 100644 --- a/accounts/views.py +++ b/accounts/views.py @@ -151,7 +151,8 @@ def group_add_user(request, group): else: user.groups.add(group) user.save() - messages.success(request, 'User added to group successfully.') + messages.success(request, + 'User added to group successfully.') else: messages.error(request, 'User not found.') return redirect('show-group', group.id) @@ -160,12 +161,12 @@ def group_add_user(request, group): if not term: return Http404() query = Q(username__icontains=term) \ - | Q(first_name__icontains=term) \ - | Q(last_name__icontains=term) + | Q(first_name__icontains=term) \ + | Q(last_name__icontains=term) users = User.objects.exclude(groups=group).filter(query)[:10] response = [] for user in users: - response += [ { + response += [{ 'label': user.username_and_fullname, 'value': user.username, }] @@ -249,7 +250,8 @@ def team_add_user(request, team): else: team.users.add(user) team.save() - messages.success(request, 'User added to team successfully.') + messages.success(request, + 'User added to team successfully.') else: messages.error(request, 'User not found.') request.session['team-tab'] = 'user' @@ -259,15 +261,15 @@ def team_add_user(request, team): if not term: return Http404() query = Q(username__icontains=term) \ - | Q(first_name__icontains=term) \ - | Q(last_name__icontains=term) + | Q(first_name__icontains=term) \ + | Q(last_name__icontains=term) users = User.objects \ - .exclude(groups__in=team.groups.all()) \ - .exclude(id__in=team.users.values('id')) \ - .filter(query)[:10] + .exclude(groups__in=team.groups.all()) \ + .exclude(id__in=team.users.values('id')) \ + .filter(query)[:10] response = [] for user in users: - response += [ { + response += [{ 'label': user.username_and_fullname, 'value': user.username, }] @@ -299,7 +301,8 @@ def team_add_group(request, team): else: team.groups.add(group) team.save() - messages.success(request, 'Group added to team successfully.') + messages.success(request, + 'Group added to team successfully.') else: messages.error(request, 'Group not found.') request.session['team-tab'] = 'group' @@ -309,11 +312,11 @@ def team_add_group(request, team): if not term: return Http404() groups = Group.objects \ - .exclude(id__in=team.groups.values('id')) \ - .filter(name__icontains=term)[:10] + .exclude(id__in=team.groups.values('id')) \ + .filter(name__icontains=term)[:10] response = [] for group in groups: - response += [ { + response += [{ 'label': group.name, 'value': group.name, }] diff --git a/permissions/forms.py b/permissions/forms.py index 3ee46e2..9b11a9f 100644 --- a/permissions/forms.py +++ b/permissions/forms.py @@ -7,7 +7,7 @@ from permissions.models import PermissionModel from accounts.models import * -__all__ = [ 'GlobalPermissionForm', 'ProjectPermissionForm' ] +__all__ = ['GlobalPermissionForm', 'ProjectPermissionForm'] class PermissionForm(forms.ModelForm): @@ -52,9 +52,9 @@ class GlobalPermissionForm(PermissionForm): class Meta: model = GlobalPermission - fields = [ 'grantee_type', 'grantee_id' ] + fields = ['grantee_type', 'grantee_id'] widgets = { - 'grantee_id': HiddenInput, + 'grantee_id': HiddenInput, } @@ -63,7 +63,7 @@ class ProjectPermissionForm(PermissionForm): class Meta: model = ProjectPermission # project is required for the unicity check - fields = [ 'project', 'grantee_type', 'grantee_id' ] + fields = ['project', 'grantee_type', 'grantee_id'] widgets = { 'project': HiddenInput, 'grantee_id': HiddenInput, diff --git a/permissions/models.py b/permissions/models.py index 6061012..7b8c800 100644 --- a/permissions/models.py +++ b/permissions/models.py @@ -7,7 +7,7 @@ from tracker.models import Project from accounts.models import * -__all__ = [ 'GlobalPermission', 'ProjectPermission' ] +__all__ = ['GlobalPermission', 'ProjectPermission'] @python_2_unicode_compatible @@ -82,7 +82,7 @@ class PermissionModel(models.Model): class GlobalPermission(PermissionModel): class Meta: - unique_together = ( 'grantee_type', 'grantee_id' ) + unique_together = ('grantee_type', 'grantee_id') # Global permissions @@ -120,7 +120,7 @@ class GlobalPermission(PermissionModel): class ProjectPermission(PermissionModel): class Meta: - unique_together = ( 'project', 'grantee_type', 'grantee_id' ) + unique_together = ('project', 'grantee_type', 'grantee_id') project = models.ForeignKey(Project, related_name='permissions') diff --git a/permissions/signals.py b/permissions/signals.py index 1d11576..6036a90 100644 --- a/permissions/signals.py +++ b/permissions/signals.py @@ -11,6 +11,7 @@ on the foreign object id, we can rely on database cascade deletion to delete outaded permissions and we have to do it our-self. """ + @receiver(pre_delete, sender=User, dispatch_uid="clean_user_perms") def clean_user_perms(sender, instance, **kwargs): # Clean global permissions diff --git a/ponytracker/local_settings.py.example b/ponytracker/local_settings.py.example index 2191255..175014b 100644 --- a/ponytracker/local_settings.py.example +++ b/ponytracker/local_settings.py.example @@ -1,14 +1,14 @@ from ponytracker.settings import * -### Uncomment to use celery worker -### Don't forget to install a broker: -### # http://docs.celeryproject.org/en/latest/getting-started/brokers/index.html#broker-overview -#INSTALLED_APPS += ('djcelery',) -#import djcelery -#djcelery.setup_loader() +# # Uncomment to use celery worker +# # Don't forget to install a broker: +# # http://docs.celeryproject.org/en/latest/getting-started/brokers/index.html#broker-overview +# INSTALLED_APPS += ('djcelery',) +# import djcelery +# djcelery.setup_loader() -SECRET_KEY='CHANGE ME' +SECRET_KEY = 'CHANGE ME' DEBUG = False diff --git a/ponytracker/settings.py b/ponytracker/settings.py index 418cbdb..9b7fa32 100644 --- a/ponytracker/settings.py +++ b/ponytracker/settings.py @@ -143,19 +143,22 @@ BOOTSTRAP3 = { #'base_url': '//netdna.bootstrapcdn.com/bootstrap/3.2.0/', 'base_url': STATIC_URL, - # The complete URL to the Bootstrap CSS file (None means derive it from base_url) + # The complete URL to the Bootstrap CSS file + # (None means derive it from base_url) 'css_url': None, - # The complete URL to the Bootstrap CSS file (None means no theme) + # The complete URL to the Bootstrap CSS file + # (None means no theme) 'theme_url': None, - # The complete URL to the Bootstrap JavaScript file (None means derive it from base_url) + # The complete URL to the Bootstrap JavaScript file + # (None means derive it from base_url) 'javascript_url': None, } # Celery configuration BROKER_URL = 'redis://localhost:6379/0' -CELERY_RESULT_BACKEND='djcelery.backends.database:DatabaseBackend' +CELERY_RESULT_BACKEND = 'djcelery.backends.database:DatabaseBackend' CELERY_ACCEPT_CONTENT = ['json'] CELERY_TASK_SERIALIZER = 'json' CELERY_RESULT_SERIALIZER = 'json' diff --git a/tox.ini b/tox.ini index e9ae6b4..6ee0502 100644 --- a/tox.ini +++ b/tox.ini @@ -1,3 +1,3 @@ [pep8] -exclude=env,issue/migrations,issue/urls.py -ignore=E128 +exclude=env,*/migrations,*/urls.py,doc +ignore=E128,E265 diff --git a/tracker/forms.py b/tracker/forms.py index 626a141..85fb158 100644 --- a/tracker/forms.py +++ b/tracker/forms.py @@ -16,7 +16,8 @@ class ProjectForm(forms.ModelForm): model = Project fields = ['display_name', 'name', 'description', 'access'] help_texts = { - 'name': 'Warning: if you change this value, this will break existing URLs.' + 'name': 'Warning: if you change this value, ' + 'this will break existing URLs.' } diff --git a/tracker/middleware.py b/tracker/middleware.py index 6402919..a230889 100644 --- a/tracker/middleware.py +++ b/tracker/middleware.py @@ -9,7 +9,7 @@ from permissions.models import PermissionModel as PermModel # This middleware protect only views of the following modules -modules = [ 'accounts.views', 'permissions.views', 'tracker.views' ] +modules = ['accounts.views', 'permissions.views', 'tracker.views'] class ProjectMiddleware: diff --git a/tracker/models.py b/tracker/models.py index dfe015e..5ef8d4a 100644 --- a/tracker/models.py +++ b/tracker/models.py @@ -14,14 +14,14 @@ from accounts.models import User from tracker.templatetags.tracker_tags import * -__all__ = [ 'Project', 'Issue', 'Label', 'Milestone', 'Event' ] +__all__ = ['Project', 'Issue', 'Label', 'Milestone', 'Event'] @python_2_unicode_compatible class Project(models.Model): class Meta: - ordering = [ 'name' ] + ordering = ['name'] ACCESS_PUBLIC = 1 ACCESS_REGISTERED = 2 @@ -81,7 +81,7 @@ class Label(models.Model): class Milestone(models.Model): class Meta: - ordering = [ 'due_date' ] + ordering = ['due_date'] name_validator = RegexValidator(regex='^[a-z0-9_.-]+$', message="Please enter only lowercase characters, number, "