Skip to content

Update behavior of newstr.__eq__() to match str.__eq__() as per reference docs #462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 8, 2019
Merged

Update behavior of newstr.__eq__() to match str.__eq__() as per reference docs #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/future/types/newstr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ def __eq__(self, other):
isinstance(other, bytes) and not isnewbytes(other)):
return super(newstr, self).__eq__(other)
else:
return False
return NotImplemented

def __hash__(self):
if (isinstance(self, unicode) or
Expand Down
10 changes: 8 additions & 2 deletions tests/test_future/test_str.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,18 +363,24 @@ def test_eq(self):
self.assertFalse(b'ABCD' == s)
self.assertFalse(bytes(b'ABCD') == s)

# We want to ensure comparison against unknown types return
# NotImplemented so that the interpreter can rerun the test with the
# other class. We expect the operator to return False if both return
# NotImplemented.
class OurCustomString(object):
def __init__(self, string):
self.string = string

def __str__(self):
return self.string
def __eq__(self, other):
return NotImplemented

our_str = OurCustomString("foobar")
new_str = str("foobar")

self.assertFalse(our_str == new_str)
self.assertFalse(new_str == our_str)
self.assertIs(new_str.__eq__(our_str), NotImplemented)
self.assertIs(our_str.__eq__(new_str), NotImplemented)

def test_hash(self):
s = str('ABCD')
Expand Down