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
bf341fb5
Commit
bf341fb5
authored
May 21, 2015
by
Yury Selivanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue 23898: Fix inspect.classify_class_attrs() to work with __eq__
parent
0978b5cd
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
3 deletions
+21
-3
Lib/inspect.py
Lib/inspect.py
+3
-3
Lib/test/test_inspect.py
Lib/test/test_inspect.py
+15
-0
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/inspect.py
View file @
bf341fb5
...
...
@@ -380,7 +380,7 @@ def classify_class_attrs(cls):
# first look in the classes
for
srch_cls
in
class_bases
:
srch_obj
=
getattr
(
srch_cls
,
name
,
None
)
if
srch_obj
==
get_obj
:
if
srch_obj
is
get_obj
:
last_cls
=
srch_cls
# then check the metaclasses
for
srch_cls
in
metamro
:
...
...
@@ -388,7 +388,7 @@ def classify_class_attrs(cls):
srch_obj
=
srch_cls
.
__getattr__
(
cls
,
name
)
except
AttributeError
:
continue
if
srch_obj
==
get_obj
:
if
srch_obj
is
get_obj
:
last_cls
=
srch_cls
if
last_cls
is
not
None
:
homecls
=
last_cls
...
...
@@ -402,7 +402,7 @@ def classify_class_attrs(cls):
# unable to locate the attribute anywhere, most likely due to
# buggy custom __dir__; discard and move on
continue
obj
=
get_obj
or
dict_obj
obj
=
get_obj
if
get_obj
is
not
None
else
dict_obj
# Classify the object or its descriptor.
if
isinstance
(
dict_obj
,
staticmethod
):
kind
=
"static method"
...
...
Lib/test/test_inspect.py
View file @
bf341fb5
...
...
@@ -782,6 +782,21 @@ class TestClassesAndFunctions(unittest.TestCase):
should_find_ga
=
inspect
.
Attribute
(
'ham'
,
'data'
,
Meta
,
'spam'
)
self
.
assertIn
(
should_find_ga
,
inspect
.
classify_class_attrs
(
VA
))
def
test_classify_overrides_bool
(
self
):
class
NoBool
(
object
):
def
__eq__
(
self
,
other
):
return
NoBool
()
def
__bool__
(
self
):
raise
NotImplementedError
(
"This object does not specify a boolean value"
)
class
HasNB
(
object
):
dd
=
NoBool
()
should_find_attr
=
inspect
.
Attribute
(
'dd'
,
'data'
,
HasNB
,
HasNB
.
dd
)
self
.
assertIn
(
should_find_attr
,
inspect
.
classify_class_attrs
(
HasNB
))
def
test_classify_metaclass_class_attribute
(
self
):
class
Meta
(
type
):
fish
=
'slap'
...
...
Misc/NEWS
View file @
bf341fb5
...
...
@@ -260,6 +260,9 @@ Library
- asyncio: async() function is deprecated in favour of ensure_future().
- Issue 23898: Fix inspect.classify_class_attrs() to support attributes
with overloaded __eq__ and __bool__. Patch by Mike Bayer.
Tests
-----
...
...
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