flake8 fixes

awx/main/fields.py

@@ -2,7 +2,7 @@
 # All Rights Reserved.
 
 # Django
-from django.db.models.signals import post_save, post_init
+from django.db.models.signals import post_save
 from django.db import models
 from django.db.models.fields.related import SingleRelatedObjectDescriptor
 from django.db.models.fields.related import ReverseSingleRelatedObjectDescriptor

awx/main/models/credential.py

@@ -159,13 +159,13 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique, ResourceMixin):
         role_name='Credential Owner',
         parent_role='team.admin_role',
         resource_field='resource',
-        permissions = { 'all': True }
+        permissions = {'all': True}
     )
     usage_role = ImplicitRoleField(
         role_name='Credential User',
         resource_field='resource',
         parent_role= 'team.member_role',
-        permissions = { 'use': True }
+        permissions = {'use': True}
     )
 
     @property

awx/main/models/inventory.py

@@ -97,13 +97,13 @@ class Inventory(CommonModel, ResourceMixin):
         role_name='Inventory Administrator',
         parent_role='organization.admin_role',
         resource_field='resource',
-        permissions = { 'all': True }
+        permissions = {'all': True}
     )
     auditor_role = ImplicitRoleField(
         role_name='Inventory Auditor',
         parent_role='organization.auditor_role',
         resource_field='resource',
-        permissions = { 'read': True }
+        permissions = {'read': True}
     )
     updater_role = ImplicitRoleField(
         role_name='Inventory Updater',
@@ -546,13 +546,13 @@ class Group(CommonModelNameNotUnique, ResourceMixin):
         role_name='Inventory Group Administrator',
         parent_role='inventory.admin_role',
         resource_field='resource',
-        permissions = { 'all': True }
+        permissions = {'all': True}
     )
     auditor_role = ImplicitRoleField(
         role_name='Inventory Group Auditor',
         parent_role='inventory.auditor_role',
         resource_field='resource',
-        permissions = { 'read': True }
+        permissions = {'read': True}
     )
     updater_role = ImplicitRoleField(
         role_name='Inventory Group Updater',

awx/main/models/jobs.py

@@ -185,19 +185,19 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, ResourceMixin):
         role_name='Job Template Administrator',
         parent_role='project.admin_role',
         resource_field='resource',
-        permissions = { 'all': True }
+        permissions = {'all': True}
     )
     auditor_role = ImplicitRoleField(
         role_name='Job Template Auditor',
         parent_role='project.auditor_role',
         resource_field='resource',
-        permissions = { 'read': True }
+        permissions = {'read': True}
     )
     executor_role = ImplicitRoleField(
         role_name='Job Template Executor',
         parent_role='project.auditor_role',
         resource_field='resource',
-        permissions = { 'execute': True }
+        permissions = {'execute': True}
     )
 
     @classmethod

awx/main/models/organization.py

@@ -55,12 +55,12 @@ class Organization(CommonModel, ResourceMixin):
     admin_role = ImplicitRoleField(
         role_name='Organization Administrator',
         resource_field='resource',
-        permissions = { 'all': True }
+        permissions = {'all': True}
     )
     auditor_role = ImplicitRoleField(
         role_name='Organization Auditor',
         resource_field='resource',
-        permissions = { 'read': True }
+        permissions = {'read': True}
     )
 
 
@@ -118,13 +118,13 @@ class Team(CommonModelNameNotUnique, ResourceMixin):
         role_name='Team Administrator',
         parent_role='organization.admin_role',
         resource_field='resource',
-        permissions = { 'all': True }
+        permissions = {'all': True}
     )
     auditor_role = ImplicitRoleField(
         role_name='Team Auditor',
         parent_role='organization.auditor_role',
         resource_field='resource',
-        permissions = { 'read': True }
+        permissions = {'read': True}
     )
     member_role = ImplicitRoleField(
         role_name='Team Member',

awx/main/models/projects.py

@@ -219,25 +219,25 @@ class Project(UnifiedJobTemplate, ProjectOptions, ResourceMixin):
         role_name='Project Administrator',
         parent_role='organization.admin_role',
         resource_field='resource',
-        permissions = { 'all': True }
+        permissions = {'all': True}
     )
     auditor_role = ImplicitRoleField(
         role_name='Project Auditor',
         parent_role='organization.auditor_role',
         resource_field='resource',
-        permissions = { 'read': True }
+        permissions = {'read': True}
     )
     member_role = ImplicitRoleField(
         role_name='Project Member',
         parent_role='admin',
         resource_field='resource',
-        permissions = { 'usage': True }
+        permissions = {'usage': True}
     )
     scm_update_role = ImplicitRoleField(
         role_name='Project Updater',
         parent_role='admin',
         resource_field='resource',
-        permissions = { 'scm_update': True }
+        permissions = {'scm_update': True}
     )
 
     @classmethod

awx/main/models/rbac.py

@@ -82,7 +82,7 @@ class Role(CommonModelNameNotUnique):
         except Role.DoesNotExist:
             ret = Role(singleton_name=name)
             ret.save()
-            return ret;
+            return ret
 
 
 

awx/main/tests/functional/conftest.py

@@ -40,6 +40,6 @@ def permissions():
                    'update':False, 'delete':False, 'scm_update':False, 'execute':False, 'use':False,},
 
         'usage':{'read':False, 'create':False, 'write':False,
-               'update':False, 'delete':False, 'scm_update':False, 'execute':False, 'use':True,},
+                 'update':False, 'delete':False, 'scm_update':False, 'execute':False, 'use':True,},
     }
 

awx/main/tests/functional/test_rbac_credential.py

@@ -21,7 +21,7 @@ def test_credential_migration_team_member(credential, team, user, permissions):
     credential.team = team
 
     # No permissions pre-migration
-    assert credential.accessible_by(u, permissions['admin']) == False
+    assert not credential.accessible_by(u, permissions['admin'])
 
     migrated = credential.migrate_to_rbac()
     # Admin permissions post migration
@@ -35,7 +35,7 @@ def test_credential_migration_team_admin(credential, team, user, permissions):
     credential.team = team
 
     # No permissions pre-migration
-    assert credential.accessible_by(u, permissions['usage']) == False
+    assert not credential.accessible_by(u, permissions['usage'])
 
     # Usage permissions post migration
     migrated = credential.migrate_to_rbac()

awx/main/tests/functional/test_rbac_organization.py

@@ -7,7 +7,7 @@ def test_organization_migration_admin(organization, permissions, user):
     u = user('admin', True)
     organization.admins.add(u)
 
-    assert organization.accessible_by(u, permissions['admin']) == False
+    assert not organization.accessible_by(u, permissions['admin'])
 
     migrated_users = organization.migrate_to_rbac()
     assert len(migrated_users) == 1
@@ -18,7 +18,7 @@ def test_organization_migration_user(organization, permissions, user):
     u = user('user', False)
     organization.users.add(u)
 
-    assert organization.accessible_by(u, permissions['auditor']) == False
+    assert not organization.accessible_by(u, permissions['auditor'])
 
     migrated_users = organization.migrate_to_rbac()
     assert len(migrated_users) == 1
@@ -27,7 +27,7 @@ def test_organization_migration_user(organization, permissions, user):
 @pytest.mark.django_db
 def test_organization_access_superuser(organization, user):
     access = OrganizationAccess(user('admin', True))
-    assert access.can_change(organization, None) == True
+    assert access.can_change(organization, None)
 
 @pytest.mark.django_db
 def test_organization_access_admin(organization, user):
@@ -35,9 +35,9 @@ def test_organization_access_admin(organization, user):
     organization.admins.add(u)
 
     access = OrganizationAccess(u)
-    assert access.can_change(organization, None) == True
+    assert access.can_change(organization, None)
 
 @pytest.mark.django_db
 def test_organization_access_user(organization, user):
     access = OrganizationAccess(user('user', False))
-    assert access.can_change(organization, None) == False
+    assert not access.can_change(organization, None)