Skip to content

bpo-26103 resolve Data descriptor contradiction #1959

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
serhiy-storchaka merged 20 commits into from
May 20, 2018
Merged

bpo-26103 resolve Data descriptor contradiction #1959

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
d9fd529
update documentation
aaronchall Jun 5, 2017
42a007b
update inspect function
aaronchall Jun 5, 2017
7d06227
add Misc/NEWS entry for abc.ABC slots
aaronchall Jun 6, 2017
aada79a
add Misc/NEWS entry for inspect.isdatadescriptor
aaronchall Jun 6, 2017
7164f94
Merge branch 'datadescrcontradiction' of https://github.com/aaronchal…
aaronchall Jun 6, 2017
0a993a1
Merge branch 'master' into datadescrcontradiction
aaronchall Jun 6, 2017
6aa2d87
add tests for isdatadescriptor custom, slots, property and functions
aaronchall Jun 6, 2017
dbc2c25
Merge branch 'datadescrcontradiction' of https://github.com/aaronchal…
aaronchall Jun 6, 2017
0858e03
add self to Misc/ACKS
aaronchall Jun 6, 2017
2439277
be more specific in test msg
aaronchall Jun 7, 2017
4bc76c9
clarify docstring
aaronchall Jun 7, 2017
ef3d4d3
clarify "or" is not exclusive
aaronchall Jun 7, 2017
e2f767c
remove "either" - "or" is not exclusive
aaronchall Jun 7, 2017
2ab592f
Enabled tests, tests passing, style fixes per request by Serhiy.
aaronchall Sep 14, 2017
2b0beab
Resolving conflict - learned updates go on top
aaronchall Sep 19, 2017
2f3ef81
when in Rome (change from issue to bpo-)
aaronchall Sep 19, 2017
ed7caa7
remove entry - such entries go in News.d now
aaronchall Sep 22, 2017
eb882ce
add blurb
aaronchall May 14, 2018
a69a525
change "and/or" to "or"
aaronchall May 20, 2018
a7af9f6
docstring - change "and/or" to "or"
aaronchall May 20, 2018
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
be more specific in test msg
  • Loading branch information
@aaronchall
aaronchall authored Jun 7, 2017
commit 24392778a2c50e445de2b4b283df5c93dd8c9158
2 changes: 1 addition & 1 deletion Lib/test/test_inspect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,7 @@ def __delete__(self, name): ""
class DataDescriptor2(object):
__set__ = None
self.assertFalse(inspect.isdatadescriptor(NonDataDescriptor),

@serhiy-storchaka serhiy-storchaka Sep 12, 2017

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 returns False because NonDataDescriptor is a class.

'class with __get__ not a data descriptor')
'class with only __get__ not a data descriptor')
self.assertTrue(inspect.isdatadescriptor(DataDescriptor0),

@serhiy-storchaka serhiy-storchaka Sep 12, 2017

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 test would fail if TestIsDataDescriptor run.

'class with __set__ is a data descriptor')
self.assertTrue(inspect.isdatadescriptor(DataDescriptor1),
Expand Down