move code linting to a stricter pep8-esque auto-formatting tool, black

awx/main/models/organization.py

@@ -2,7 +2,6 @@
 # All Rights Reserved.
 
 
-
 # Django
 from django.conf import settings
 from django.db import models
@@ -14,13 +13,8 @@ from django.utils.translation import ugettext_lazy as _
 
 # AWX
 from awx.api.versioning import reverse
-from awx.main.fields import (
-    AutoOneToOneField, ImplicitRoleField, OrderedManyToManyField
-)
-from awx.main.models.base import (
-    BaseModel, CommonModel, CommonModelNameNotUnique, CreatedModifiedModel,
-    NotificationFieldsModel
-)
+from awx.main.fields import AutoOneToOneField, ImplicitRoleField, OrderedManyToManyField
+from awx.main.models.base import BaseModel, CommonModel, CommonModelNameNotUnique, CreatedModifiedModel, NotificationFieldsModel
 from awx.main.models.rbac import (
     ROLE_SINGLETON_SYSTEM_ADMINISTRATOR,
     ROLE_SINGLETON_SYSTEM_AUDITOR,
@@ -32,35 +26,24 @@ __all__ = ['Organization', 'Team', 'Profile', 'UserSessionMembership']
 
 
 class Organization(CommonModel, NotificationFieldsModel, ResourceMixin, CustomVirtualEnvMixin, RelatedJobsMixin):
-    '''
+    """
     An organization is the basic unit of multi-tenancy divisions
-    '''
+    """
 
     class Meta:
         app_label = 'main'
         ordering = ('name',)
 
-    instance_groups = OrderedManyToManyField(
-        'InstanceGroup',
-        blank=True,
-        through='OrganizationInstanceGroupMembership'
-    )
+    instance_groups = OrderedManyToManyField('InstanceGroup', blank=True, through='OrganizationInstanceGroupMembership')
     galaxy_credentials = OrderedManyToManyField(
-        'Credential',
-        blank=True,
-        through='OrganizationGalaxyCredentialMembership',
-        related_name='%(class)s_galaxy_credentials'
+        'Credential', blank=True, through='OrganizationGalaxyCredentialMembership', related_name='%(class)s_galaxy_credentials'
     )
     max_hosts = models.PositiveIntegerField(
         blank=True,
         default=0,
         help_text=_('Maximum number of hosts allowed to be managed by this organization.'),
     )
-    notification_templates_approvals = models.ManyToManyField(
-        "NotificationTemplate",
-        blank=True,
-        related_name='%(class)s_notification_templates_for_approvals'
-    )
+    notification_templates_approvals = models.ManyToManyField("NotificationTemplate", blank=True, related_name='%(class)s_notification_templates_for_approvals')
     default_environment = models.ForeignKey(
         'ExecutionEnvironment',
         null=True,
@@ -101,42 +84,41 @@ class Organization(CommonModel, NotificationFieldsModel, ResourceMixin, CustomVi
     auditor_role = ImplicitRoleField(
         parent_role='singleton:' + ROLE_SINGLETON_SYSTEM_AUDITOR,
     )
-    member_role = ImplicitRoleField(
-        parent_role=['admin_role']
-    )
+    member_role = ImplicitRoleField(parent_role=['admin_role'])
     read_role = ImplicitRoleField(
-        parent_role=['member_role', 'auditor_role',
-                     'execute_role', 'project_admin_role',
-                     'inventory_admin_role', 'workflow_admin_role',
-                     'notification_admin_role', 'credential_admin_role',
-                     'job_template_admin_role', 'approval_role', 
-                     'execution_environment_admin_role',],
+        parent_role=[
+            'member_role',
+            'auditor_role',
+            'execute_role',
+            'project_admin_role',
+            'inventory_admin_role',
+            'workflow_admin_role',
+            'notification_admin_role',
+            'credential_admin_role',
+            'job_template_admin_role',
+            'approval_role',
+            'execution_environment_admin_role',
+        ],
     )
     approval_role = ImplicitRoleField(
         parent_role='admin_role',
     )
 
-
     def get_absolute_url(self, request=None):
         return reverse('api:organization_detail', kwargs={'pk': self.pk}, request=request)
 
     '''
     RelatedJobsMixin
     '''
+
     def _get_related_jobs(self):
         return UnifiedJob.objects.non_polymorphic().filter(organization=self)
 
 
 class OrganizationGalaxyCredentialMembership(models.Model):
 
-    organization = models.ForeignKey(
-        'Organization',
-        on_delete=models.CASCADE
-    )
-    credential = models.ForeignKey(
-        'Credential',
-        on_delete=models.CASCADE
-    )
+    organization = models.ForeignKey('Organization', on_delete=models.CASCADE)
+    credential = models.ForeignKey('Credential', on_delete=models.CASCADE)
     position = models.PositiveIntegerField(
         null=True,
         default=None,
@@ -145,9 +127,9 @@ class OrganizationGalaxyCredentialMembership(models.Model):
 
 
 class Team(CommonModelNameNotUnique, ResourceMixin):
-    '''
+    """
     A team is a group of users that work on common projects.
-    '''
+    """
 
     class Meta:
         app_label = 'main'
@@ -176,20 +158,15 @@ class Team(CommonModelNameNotUnique, ResourceMixin):
 
 
 class Profile(CreatedModifiedModel):
-    '''
+    """
     Profile model related to User object. Currently stores LDAP DN for users
     loaded from LDAP.
-    '''
+    """
 
     class Meta:
         app_label = 'main'
 
-    user = AutoOneToOneField(
-        'auth.User',
-        related_name='profile',
-        editable=False,
-        on_delete=models.CASCADE
-    )
+    user = AutoOneToOneField('auth.User', related_name='profile', editable=False, on_delete=models.CASCADE)
     ldap_dn = models.CharField(
         max_length=1024,
         default='',
@@ -197,21 +174,17 @@ class Profile(CreatedModifiedModel):
 
 
 class UserSessionMembership(BaseModel):
-    '''
+    """
     A lookup table for API session membership given user. Note, there is a
     different session created by channels for websockets using the same
     underlying model.
-    '''
+    """
 
     class Meta:
         app_label = 'main'
 
-    user = models.ForeignKey(
-        'auth.User', related_name='+', blank=False, null=False, on_delete=models.CASCADE
-    )
-    session = models.OneToOneField(
-        Session, related_name='+', blank=False, null=False, on_delete=models.CASCADE
-    )
+    user = models.ForeignKey('auth.User', related_name='+', blank=False, null=False, on_delete=models.CASCADE)
+    session = models.OneToOneField(Session, related_name='+', blank=False, null=False, on_delete=models.CASCADE)
     created = models.DateTimeField(default=None, editable=False)
 
     @staticmethod
@@ -220,16 +193,15 @@ class UserSessionMembership(BaseModel):
             return []
         if now is None:
             now = tz_now()
-        query_set = UserSessionMembership.objects\
-            .select_related('session')\
-            .filter(user_id=user_id)\
-            .order_by('-created')
+        query_set = UserSessionMembership.objects.select_related('session').filter(user_id=user_id).order_by('-created')
         non_expire_memberships = [x for x in query_set if x.session.expire_date > now]
-        return non_expire_memberships[settings.SESSIONS_PER_USER:]
+        return non_expire_memberships[settings.SESSIONS_PER_USER :]
 
 
 # Add get_absolute_url method to User model if not present.
 if not hasattr(User, 'get_absolute_url'):
+
     def user_get_absolute_url(user, request=None):
         return reverse('api:user_detail', kwargs={'pk': user.pk}, request=request)
+
     User.add_to_class('get_absolute_url', user_get_absolute_url)