Skip to content
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Address review
  • Loading branch information
sobolevn committed Nov 25, 2022
commit 5893ba73b9f2eead7065b5ce4f9bffbb810d369f
40 changes: 26 additions & 14 deletions Lib/test/test_operator.py
Original file line number Diff line number Diff line change
Expand Up @@ -531,27 +531,33 @@ def test_concat(self):
self.assertEqual(data2, 'ab') # must not change

# Subclasses:
class ListSubclass(list): ...
class ListSubclass(list):
pass

data1 = ListSubclass([1, 2])
data2 = ListSubclass(['a', 'b'])
self.assertEqual(operator.concat(data1, data2),
ListSubclass([1, 2, 'a', 'b']))
self.assertEqual(operator.concat(data1, data2), data1 + data2)

res = operator.concat(data1, data2)
self.assertIsInstance(res, list)
Comment thread
ambv marked this conversation as resolved.
Outdated
self.assertEqual(res, [1, 2, 'a', 'b'])
self.assertIsInstance(data1, ListSubclass)
Comment thread
ambv marked this conversation as resolved.
Outdated
self.assertEqual(data1, ListSubclass([1, 2])) # must not change
self.assertIsInstance(data2, ListSubclass)
self.assertEqual(data2, ListSubclass(['a', 'b'])) # must not change

# Custom type with `__add__`:
class TupleSubclass(tuple):
def __add__(self, other):
return other + self
return TupleSubclass(other + self)

data1 = TupleSubclass([1, 2])
data2 = ('a', 'b')
self.assertEqual(operator.concat(data1, data2),
TupleSubclass(['a', 'b', 1, 2]))
self.assertEqual(operator.concat(data1, data2), data1 + data2)
res = operator.concat(data1, data2)
self.assertIsInstance(res, TupleSubclass)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one is good.

self.assertEqual(res, TupleSubclass(['a', 'b', 1, 2]))
self.assertIsInstance(data1, TupleSubclass)
Comment thread
ambv marked this conversation as resolved.
Outdated
self.assertEqual(data1, TupleSubclass([1, 2])) # must not change
self.assertIsInstance(data2, tuple)
self.assertEqual(data2, ('a', 'b')) # must not change

# Corner cases:
Expand Down Expand Up @@ -599,26 +605,32 @@ def test_iconcat(self):
self.assertEqual(data2, 'ab') # must not change

# Subclasses:
class ListSubclass(list): ...
class ListSubclass(list):
pass

data1 = ListSubclass([1, 2])
data2 = ListSubclass(['a', 'b'])
res = operator.iconcat(data1, data2)
self.assertEqual(res, ListSubclass([1, 2, 'a', 'b']))
self.assertIsInstance(res, ListSubclass)
self.assertEqual(res, [1, 2, 'a', 'b'])
self.assertIsInstance(data1, ListSubclass)
self.assertEqual(data1, ListSubclass([1, 2, 'a', 'b'])) # must change
self.assertIsInstance(data2, ListSubclass)
self.assertEqual(data2, ListSubclass(['a', 'b'])) # must not change

# Custom type with `__add__`:
class TupleSubclass(tuple):
def __add__(self, other):
return other + self
return TupleSubclass(other + self)

data1 = TupleSubclass([1, 2])
data2 = ('a', 'b')
self.assertEqual(operator.iconcat(data1, data2),
TupleSubclass(['a', 'b', 1, 2]))
self.assertEqual(operator.iconcat(data1, data2), data1 + data2)
res = operator.iconcat(data1, data2)
self.assertIsInstance(res, TupleSubclass)
self.assertEqual(res, TupleSubclass(['a', 'b', 1, 2]))
self.assertIsInstance(data1, TupleSubclass)
self.assertEqual(data1, TupleSubclass([1, 2])) # must not change
self.assertIsInstance(data2, tuple)
self.assertEqual(data2, ('a', 'b')) # must not change

# Corner cases:
Expand Down