From fae9ef3d65f84dfae2253479251142aa1812852c Mon Sep 17 00:00:00 2001 From: Akita Noek Date: Wed, 27 Jan 2016 11:00:29 -0500 Subject: [PATCH] flake8 corrections --- awx/main/fields.py | 15 +++++++++------ awx/main/models/rbac.py | 5 ++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/awx/main/fields.py b/awx/main/fields.py index 545a773108..18c227c7bc 100644 --- a/awx/main/fields.py +++ b/awx/main/fields.py @@ -4,8 +4,11 @@ # Django from django.db import models from django.db.models.fields.related import SingleRelatedObjectDescriptor -from django.db.models.fields.related import ForeignRelatedObjectsDescriptor from django.db.models.fields.related import ReverseSingleRelatedObjectDescriptor +from django.core.exceptions import FieldError + +# AWX +from awx.main.models.rbac import Resource, RolePermission, Role __all__ = ['AutoOneToOneField', 'ImplicitResourceField', 'ImplicitRoleField'] @@ -62,7 +65,7 @@ class ResourceFieldDescriptor(ReverseSingleRelatedObjectDescriptor): resource.save() setattr(instance, self.field.name, resource) instance.save(update_fields=[self.field.name,]) - return resource; + return resource class ImplicitResourceField(models.ForeignKey): @@ -76,7 +79,7 @@ class ImplicitResourceField(models.ForeignKey): super(ImplicitResourceField, self).__init__(*args, **kwargs) def contribute_to_class(self, cls, name): - super(ImplicitResourceField, self).contribute_to_class(cls, name); + super(ImplicitResourceField, self).contribute_to_class(cls, name) setattr(cls, self.name, ResourceFieldDescriptor(self.parent_resource, self)) @@ -119,7 +122,7 @@ class ImplicitRoleDescriptor(ReverseSingleRelatedObjectDescriptor): setattr(permissions, k, v) permissions.save() - return role; + return role class ImplicitRoleField(models.ForeignKey): @@ -137,7 +140,7 @@ class ImplicitRoleField(models.ForeignKey): super(ImplicitRoleField, self).__init__(*args, **kwargs) def contribute_to_class(self, cls, name): - super(ImplicitRoleField, self).contribute_to_class(cls, name); + super(ImplicitRoleField, self).contribute_to_class(cls, name) setattr(cls, self.name, ImplicitRoleDescriptor( @@ -147,5 +150,5 @@ class ImplicitRoleField(models.ForeignKey): self.parent_role, self ) - ) + ) diff --git a/awx/main/models/rbac.py b/awx/main/models/rbac.py index 73deeaf303..5d7226a73e 100644 --- a/awx/main/models/rbac.py +++ b/awx/main/models/rbac.py @@ -7,7 +7,6 @@ import logging # Django from django.db import models from django.utils.translation import ugettext_lazy as _ -from django.core.exceptions import FieldError # AWX from awx.main.models.base import * # noqa @@ -55,7 +54,7 @@ class Role(CommonModelNameNotUnique): rh = RoleHierarchy(role=self, ancestor=Role.objects.get(id=id)) rh.save() for child in self.children.all(): - child.rebuild_role_hierarchy_cache(); + child.rebuild_role_hierarchy_cache() class RoleHierarchy(CreatedModifiedModel): @@ -108,7 +107,7 @@ class Resource(CommonModelNameNotUnique): rh = ResourceHierarchy(resource=self, ancestor=Resource.objects.get(id=id)) rh.save() for child in self.children.all(): - child.rebuild_resource_hierarchy_cache(); + child.rebuild_resource_hierarchy_cache()