summaryrefslogtreecommitdiff
path: root/ironic/objects/base.py
diff options
context:
space:
mode:
authorJulia Kreger <juliaashleykreger@gmail.com>2018-05-08 12:21:13 -0700
committerJulia Kreger <juliaashleykreger@gmail.com>2018-05-09 06:11:30 -0700
commit530a3ed088dd2a21bbf4ca4c9e4c2a62fa2248db (patch)
tree73685925f7523ea994def0c5280b3e92ae979fc3 /ironic/objects/base.py
parent6ff9a6b14c22c2cf640ba7a20828fed976b25f03 (diff)
downloadironic-530a3ed088dd2a21bbf4ca4c9e4c2a62fa2248db.tar.gz
Fix W504 errors
Also a few related errors based on some earlier investigation may have been pulled in along the lines of E305. Story: #2001985 Change-Id: Ifb2d3b481202fbd8cbb472e02de0f14f4d0809fd
Diffstat (limited to 'ironic/objects/base.py')
-rw-r--r--ironic/objects/base.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/ironic/objects/base.py b/ironic/objects/base.py
index 94a3d997b..f29e4e347 100644
--- a/ironic/objects/base.py
+++ b/ironic/objects/base.py
@@ -88,8 +88,8 @@ class IronicObject(object_base.VersionedObject):
object.
"""
for field in self.fields:
- if (self.obj_attr_is_set(field) and
- self[field] != loaded_object[field]):
+ if (self.obj_attr_is_set(field)
+ and self[field] != loaded_object[field]):
self[field] = loaded_object[field]
def _convert_to_version(self, target_version,
@@ -167,8 +167,8 @@ class IronicObject(object_base.VersionedObject):
# is supported by this service. self.VERSION is the version of
# this object instance -- it may get set via e.g. the
# serialization or deserialization process, or here.
- if (self.__class__.VERSION != target_version or
- self.VERSION != self.__class__.VERSION):
+ if (self.__class__.VERSION != target_version
+ or self.VERSION != self.__class__.VERSION):
self.VERSION = target_version
@classmethod