External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-22 19:35:02 -02:30
Code Issues Packages Projects Releases Wiki Activity

flake8 corrections

Browse Source
This commit is contained in:
Akita Noek
2016-01-27 11:00:29 -05:00
parent 00619b7e36
commit fae9ef3d65
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
awx/main/fields.py
View File

@@ -4,8 +4,11 @@
# Django # Django
from django.db import models from django.db import models
from django.db.models.fields.related import SingleRelatedObjectDescriptor 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.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'] __all__ = ['AutoOneToOneField', 'ImplicitResourceField', 'ImplicitRoleField']
@@ -62,7 +65,7 @@ class ResourceFieldDescriptor(ReverseSingleRelatedObjectDescriptor):
resource.save() resource.save()
setattr(instance, self.field.name, resource) setattr(instance, self.field.name, resource)
instance.save(update_fields=[self.field.name,]) instance.save(update_fields=[self.field.name,])
return resource; return resource
class ImplicitResourceField(models.ForeignKey): class ImplicitResourceField(models.ForeignKey):
@@ -76,7 +79,7 @@ class ImplicitResourceField(models.ForeignKey):
super(ImplicitResourceField, self).__init__(*args, **kwargs) super(ImplicitResourceField, self).__init__(*args, **kwargs)
def contribute_to_class(self, cls, name): 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)) setattr(cls, self.name, ResourceFieldDescriptor(self.parent_resource, self))
@@ -119,7 +122,7 @@ class ImplicitRoleDescriptor(ReverseSingleRelatedObjectDescriptor):
setattr(permissions, k, v) setattr(permissions, k, v)
permissions.save() permissions.save()
return role; return role
class ImplicitRoleField(models.ForeignKey): class ImplicitRoleField(models.ForeignKey):
@@ -137,7 +140,7 @@ class ImplicitRoleField(models.ForeignKey):
super(ImplicitRoleField, self).__init__(*args, **kwargs) super(ImplicitRoleField, self).__init__(*args, **kwargs)
def contribute_to_class(self, cls, name): 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, setattr(cls,
self.name, self.name,
ImplicitRoleDescriptor( ImplicitRoleDescriptor(
@@ -147,5 +150,5 @@ class ImplicitRoleField(models.ForeignKey):
self.parent_role, self.parent_role,
self self
) )
) )

5
awx/main/models/rbac.py
View File

@@ -7,7 +7,6 @@ import logging
# Django # Django
from django.db import models from django.db import models
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.core.exceptions import FieldError
# AWX # AWX
from awx.main.models.base import * # noqa 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 = RoleHierarchy(role=self, ancestor=Role.objects.get(id=id))
rh.save() rh.save()
for child in self.children.all(): for child in self.children.all():
child.rebuild_role_hierarchy_cache(); child.rebuild_role_hierarchy_cache()
class RoleHierarchy(CreatedModifiedModel): class RoleHierarchy(CreatedModifiedModel):
@@ -108,7 +107,7 @@ class Resource(CommonModelNameNotUnique):
rh = ResourceHierarchy(resource=self, ancestor=Resource.objects.get(id=id)) rh = ResourceHierarchy(resource=self, ancestor=Resource.objects.get(id=id))
rh.save() rh.save()
for child in self.children.all(): for child in self.children.all():
child.rebuild_resource_hierarchy_cache(); child.rebuild_resource_hierarchy_cache()