summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/collections/__init__.py6
-rw-r--r--Lib/test/test_userlist.py6
-rw-r--r--Misc/NEWS.d/next/Core and Builtins/2019-05-07-15-49-17.bpo-27639.b1Ah87.rst2
3 files changed, 13 insertions, 1 deletions
diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py
index e6cafb3..706907a 100644
--- a/Lib/collections/__init__.py
+++ b/Lib/collections/__init__.py
@@ -1085,7 +1085,11 @@ class UserList(_collections_abc.MutableSequence):
return other.data if isinstance(other, UserList) else other
def __contains__(self, item): return item in self.data
def __len__(self): return len(self.data)
- def __getitem__(self, i): return self.data[i]
+ def __getitem__(self, i):
+ if isinstance(i, slice):
+ return self.__class__(self.data[i])
+ else:
+ return self.data[i]
def __setitem__(self, i, item): self.data[i] = item
def __delitem__(self, i): del self.data[i]
def __add__(self, other):
diff --git a/Lib/test/test_userlist.py b/Lib/test/test_userlist.py
index 8de6c14..1ed67da 100644
--- a/Lib/test/test_userlist.py
+++ b/Lib/test/test_userlist.py
@@ -17,6 +17,12 @@ class UserListTest(list_tests.CommonTest):
for j in range(-3, 6):
self.assertEqual(u[i:j], l[i:j])
+ def test_slice_type(self):
+ l = [0, 1, 2, 3, 4]
+ u = UserList(l)
+ self.assertIsInstance(u[:], u.__class__)
+ self.assertEqual(u[:],u)
+
def test_add_specials(self):
u = UserList("spam")
u2 = u + "eggs"
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-05-07-15-49-17.bpo-27639.b1Ah87.rst b/Misc/NEWS.d/next/Core and Builtins/2019-05-07-15-49-17.bpo-27639.b1Ah87.rst
new file mode 100644
index 0000000..ae5b915
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2019-05-07-15-49-17.bpo-27639.b1Ah87.rst
@@ -0,0 +1,2 @@
+Correct return type for UserList slicing operations. Patch by Michael Blahay,
+Erick Cervantes, and vaultah