From d24aaa8626f38bf752d3e775c7956e44d0742f16 Mon Sep 17 00:00:00 2001 From: Adam Nelson Date: Fri, 19 Aug 2016 19:24:51 -0400 Subject: [PATCH] Final changes --- openmc/mixin.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/openmc/mixin.py b/openmc/mixin.py index 3495f0f6fa..dd97e89249 100644 --- a/openmc/mixin.py +++ b/openmc/mixin.py @@ -7,18 +7,14 @@ class EqualityMixin(object): """ def __eq__(self, other): - eqval = True if isinstance(other, type(self)): for key, value in self.__dict__.items(): - if key in other.__dict__: - if not np.array_equal(value, other.__dict__.get(key)): - eqval = False - else: - eqval = False + if not np.array_equal(value, other.__dict__.get(key)): + return False else: - eqval = False + return False - return eqval + return True def __ne__(self, other): return not self.__eq__(other)