From d82366f8263314af708bd32ead9fdefb3e001b81 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Fri, 6 Feb 2015 22:13:14 -0500 Subject: [PATCH] Tech Debt: Fixed code alignment issues Just code reformatting in the objects/ folder Closes-Bug: 1416789 Change-Id: I4dfd4412d032a2a67a370abfe673302b0820058d --- magnum/objects/base.py | 12 ++++++------ magnum/objects/bay.py | 2 +- magnum/objects/baymodel.py | 8 ++++---- magnum/objects/container.py | 8 ++++---- magnum/objects/node.py | 8 ++++---- magnum/objects/pod.py | 2 +- magnum/objects/replicationcontroller.py | 6 +++--- magnum/objects/service.py | 2 +- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/magnum/objects/base.py b/magnum/objects/base.py index d198e6cae7..a8fe00b6a2 100644 --- a/magnum/objects/base.py +++ b/magnum/objects/base.py @@ -195,7 +195,7 @@ class MagnumObject(object): fields = { 'created_at': obj_utils.datetime_or_str_or_none, 'updated_at': obj_utils.datetime_or_str_or_none, - } + } obj_extra_fields = [] _attr_created_at_from_primitive = obj_utils.dt_deserializer @@ -404,7 +404,7 @@ class MagnumObject(object): """ for name in self.fields.keys() + self.obj_extra_fields: if (hasattr(self, get_attrname(name)) or - name in self.obj_extra_fields): + name in self.obj_extra_fields): yield name, getattr(self, name) items = lambda self: list(self.iteritems()) @@ -454,8 +454,8 @@ class MagnumObject(object): def as_dict(self): return dict((k, getattr(self, k)) - for k in self.fields - if hasattr(self, k)) + for k in self.fields + if hasattr(self, k)) class ObjectListBase(object): @@ -468,7 +468,7 @@ class ObjectListBase(object): """ fields = { 'objects': list, - } + } # This is a dictionary of my_version:child_version mappings so that # we can support backleveling our contents based on the version @@ -566,7 +566,7 @@ class MagnumObjectSerializer(messaging.NoOpSerializer): entity = self._process_iterable(context, self.serialize_entity, entity) elif (hasattr(entity, 'obj_to_primitive') and - callable(entity.obj_to_primitive)): + callable(entity.obj_to_primitive)): entity = entity.obj_to_primitive() return entity diff --git a/magnum/objects/bay.py b/magnum/objects/bay.py index 56fc1e36eb..06070cd714 100644 --- a/magnum/objects/bay.py +++ b/magnum/objects/bay.py @@ -176,5 +176,5 @@ class Bay(base.MagnumObject): current = self.__class__.get_by_uuid(self._context, uuid=self.uuid) for field in self.fields: if (hasattr(self, base.get_attrname(field)) and - self[field] != current[field]): + self[field] != current[field]): self[field] = current[field] diff --git a/magnum/objects/baymodel.py b/magnum/objects/baymodel.py index 6c55d05cae..004305289b 100644 --- a/magnum/objects/baymodel.py +++ b/magnum/objects/baymodel.py @@ -106,9 +106,9 @@ class BayModel(base.MagnumObject): """ db_baymodels = cls.dbapi.get_baymodel_list(context, limit=limit, - marker=marker, - sort_key=sort_key, - sort_dir=sort_dir) + marker=marker, + sort_key=sort_key, + sort_dir=sort_dir) return BayModel._from_db_object_list(db_baymodels, cls, context) @base.remotable @@ -178,5 +178,5 @@ class BayModel(base.MagnumObject): current = self.__class__.get_by_uuid(self._context, uuid=self.uuid) for field in self.fields: if (hasattr(self, base.get_attrname(field)) and - self[field] != current[field]): + self[field] != current[field]): self[field] = current[field] diff --git a/magnum/objects/container.py b/magnum/objects/container.py index 02760d50b4..d961602d8c 100644 --- a/magnum/objects/container.py +++ b/magnum/objects/container.py @@ -85,9 +85,9 @@ class Container(base.MagnumObject): """ db_containers = cls.dbapi.get_container_list(context, limit=limit, - marker=marker, - sort_key=sort_key, - sort_dir=sort_dir) + marker=marker, + sort_key=sort_key, + sort_dir=sort_dir) return Container._from_db_object_list(db_containers, cls, context) @base.remotable @@ -157,5 +157,5 @@ class Container(base.MagnumObject): current = self.__class__.get_by_uuid(self._context, uuid=self.uuid) for field in self.fields: if (hasattr(self, base.get_attrname(field)) and - self[field] != current[field]): + self[field] != current[field]): self[field] = current[field] diff --git a/magnum/objects/node.py b/magnum/objects/node.py index aeb6bd9d98..87949e4cd9 100644 --- a/magnum/objects/node.py +++ b/magnum/objects/node.py @@ -85,9 +85,9 @@ class Node(base.MagnumObject): """ db_nodes = cls.dbapi.get_node_list(context, limit=limit, - marker=marker, - sort_key=sort_key, - sort_dir=sort_dir) + marker=marker, + sort_key=sort_key, + sort_dir=sort_dir) return Node._from_db_object_list(db_nodes, cls, context) @base.remotable @@ -157,5 +157,5 @@ class Node(base.MagnumObject): current = self.__class__.get_by_uuid(self._context, uuid=self.uuid) for field in self.fields: if (hasattr(self, base.get_attrname(field)) and - self[field] != current[field]): + self[field] != current[field]): self[field] = current[field] diff --git a/magnum/objects/pod.py b/magnum/objects/pod.py index f8d412b7dd..2bb2a28c66 100644 --- a/magnum/objects/pod.py +++ b/magnum/objects/pod.py @@ -190,5 +190,5 @@ class Pod(base.MagnumObject): current = self.__class__.get_by_uuid(self._context, uuid=self.uuid) for field in self.fields: if (hasattr(self, base.get_attrname(field)) and - self[field] != current[field]): + self[field] != current[field]): self[field] = current[field] diff --git a/magnum/objects/replicationcontroller.py b/magnum/objects/replicationcontroller.py index 09946496c8..87809195f5 100644 --- a/magnum/objects/replicationcontroller.py +++ b/magnum/objects/replicationcontroller.py @@ -55,8 +55,8 @@ class ReplicationController(base.MagnumObject): @staticmethod def _from_db_object_list(db_objects, cls, context): """Converts a list of database entities to a list of formal objects.""" - return [ReplicationController._from_db_object(cls(context), - obj) for obj in db_objects] + return [ReplicationController._from_db_object(cls(context), obj) + for obj in db_objects] @base.remotable_classmethod def get_by_id(cls, context, rc_id): @@ -182,5 +182,5 @@ class ReplicationController(base.MagnumObject): current = self.__class__.get_by_uuid(self._context, uuid=self.uuid) for field in self.fields: if (hasattr(self, base.get_attrname(field)) and - self[field] != current[field]): + self[field] != current[field]): self[field] = current[field] diff --git a/magnum/objects/service.py b/magnum/objects/service.py index 0ef53e9a62..beff51370e 100644 --- a/magnum/objects/service.py +++ b/magnum/objects/service.py @@ -179,5 +179,5 @@ class Service(base.MagnumObject): current = self.__class__.get_by_uuid(self._context, uuid=self.uuid) for field in self.fields: if (hasattr(self, base.get_attrname(field)) and - self[field] != current[field]): + self[field] != current[field]): self[field] = current[field]