Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
7c573857
Commit
7c573857
authored
Dec 06, 2013
by
Serhiy Storchaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #16373: Prevent infinite recursion for ABC Set class comparisons.
parent
d919da99
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
2 deletions
+33
-2
Lib/_abcoll.py
Lib/_abcoll.py
+2
-2
Lib/test/test_collections.py
Lib/test/test_collections.py
+29
-0
Misc/NEWS
Misc/NEWS
+2
-0
No files found.
Lib/_abcoll.py
View file @
7c573857
...
...
@@ -165,12 +165,12 @@ class Set(Sized, Iterable, Container):
def
__gt__
(
self
,
other
):
if
not
isinstance
(
other
,
Set
):
return
NotImplemented
return
other
<
self
return
other
.
__lt__
(
self
)
def
__ge__
(
self
,
other
):
if
not
isinstance
(
other
,
Set
):
return
NotImplemented
return
other
<=
self
return
other
.
__le__
(
self
)
def
__eq__
(
self
,
other
):
if
not
isinstance
(
other
,
Set
):
...
...
Lib/test/test_collections.py
View file @
7c573857
...
...
@@ -594,6 +594,35 @@ class TestCollectionABCs(ABCTestCase):
s
|=
s
self
.
assertEqual
(
s
,
full
)
def
test_issue16373
(
self
):
# Recursion error comparing comparable and noncomparable
# Set instances
class
MyComparableSet
(
Set
):
def
__contains__
(
self
,
x
):
return
False
def
__len__
(
self
):
return
0
def
__iter__
(
self
):
return
iter
([])
class
MyNonComparableSet
(
Set
):
def
__contains__
(
self
,
x
):
return
False
def
__len__
(
self
):
return
0
def
__iter__
(
self
):
return
iter
([])
def
__le__
(
self
,
x
):
return
NotImplemented
def
__lt__
(
self
,
x
):
return
NotImplemented
cs
=
MyComparableSet
()
ncs
=
MyNonComparableSet
()
self
.
assertFalse
(
ncs
<
cs
)
self
.
assertFalse
(
ncs
<=
cs
)
self
.
assertFalse
(
cs
>
ncs
)
self
.
assertFalse
(
cs
>=
ncs
)
def
test_Mapping
(
self
):
for
sample
in
[
dict
]:
self
.
assertIsInstance
(
sample
(),
Mapping
)
...
...
Misc/NEWS
View file @
7c573857
...
...
@@ -15,6 +15,8 @@ Core and Builtins
Library
-------
- Issue #16373: Prevent infinite recursion for ABC Set class comparisons.
- Issue #19138: doctest'
s
IGNORE_EXCEPTION_DETAIL
now
allows
a
match
when
no
exception
detail
exists
(
no
colon
following
the
exception
's name, or
a colon does follow but no text follows the colon).
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment