python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-03-13 17:25:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1967 from mattBoros/image-equals-fix

Browse Source 
Change equals method on Image so it short circuits
This commit is contained in:
Hugo 2016-06-20 12:40:25 +03:00 committed by GitHub
commit 08cb1dbf40
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PIL/Image.py
View File

@ -584,16 +584,14 @@ class Image(object):
return file
def __eq__(self, other):
if self.__class__.__name__ != other.__class__.__name__:
return False
a = (self.mode == other.mode)
b = (self.size == other.size)
c = (self.getpalette() == other.getpalette())
d = (self.info == other.info)
e = (self.category == other.category)
f = (self.readonly == other.readonly)
g = (self.tobytes() == other.tobytes())
return a and b and c and d and e and f and g
return (self.__class__.__name__ == other.__class__.__name__ and
self.mode == other.mode and
self.size == other.size and
self.info == other.info and
self.category == other.category and
self.readonly == other.readonly and
self.getpalette() == other.getpalette() and
self.tobytes() == other.tobytes())
def __ne__(self, other):
eq = (self == other)