| route-pattern | /:user_id/:repository/pull/:id/files(.:format) |
| route-controller | pull_requests |
| route-action | files |
| fetch-nonce | v2:36ea5986-6681-84e4-7eb1-7fdf9325a5f2 |
| current-catalog-service-hash | ae870bc5e265a340912cde392f23dad3671a0a881730ffdadd82f2f57d81641b |
| request-id | CBAE:3651F6:5D7011:79390E:696AE745 |
| html-safe-nonce | 989726b545f65d53929725876f08dbb9750a2e7ab845e8048c9773d28a997b93 |
| visitor-payload | eyJyZWZlcnJlciI6IiIsInJlcXVlc3RfaWQiOiJDQkFFOjM2NTFGNjo1RDcwMTE6NzkzOTBFOjY5NkFFNzQ1IiwidmlzaXRvcl9pZCI6IjQxNjk0OTAzMjIxMzcyMTI3NDEiLCJyZWdpb25fZWRnZSI6ImlhZCIsInJlZ2lvbl9yZW5kZXIiOiJpYWQifQ== |
| visitor-hmac | b0d7e466c18e8853ca9bd9b4baa73631ead167b4397cc55e9bafde0a06358d2d |
| hovercard-subject-tag | pull_request:124078066 |
| github-keyboard-shortcuts | repository,pull-request-list,pull-request-conversation,pull-request-files-changed,copilot |
| google-site-verification | Apib7-x98H0j5cPqHWwSMm6dNU4GmODRoqxLiDzdx9I |
| octolytics-url | https://collector.github.com/github/collect |
| analytics-location | ///pull_requests/show/files |
| fb:app_id | 1401488693436528 |
| apple-itunes-app | app-id=1477376905, app-argument=https://github.com/python/cpython/pull/1959/files |
| twitter:image | https://avatars.githubusercontent.com/u/953306?s=400&v=4 |
| twitter:card | summary_large_image |
| og:image | https://avatars.githubusercontent.com/u/953306?s=400&v=4 |
| og:image:alt | https://bugs.python.org/issue26103 |
| og:site_name | GitHub |
| og:type | object |
| hostname | github.com |
| expected-hostname | github.com |
| None | 5f99f7c1d70f01da5b93e5ca90303359738944d8ab470e396496262c66e60b8d |
| turbo-cache-control | no-preview |
| diff-view | unified |
| go-import | github.com/python/cpython git https://github.com/python/cpython.git |
| octolytics-dimension-user_id | 1525981 |
| octolytics-dimension-user_login | python |
| octolytics-dimension-repository_id | 81598961 |
| octolytics-dimension-repository_nwo | python/cpython |
| octolytics-dimension-repository_public | true |
| octolytics-dimension-repository_is_fork | false |
| octolytics-dimension-repository_network_root_id | 81598961 |
| octolytics-dimension-repository_network_root_nwo | python/cpython |
| turbo-body-classes | logged-out env-production page-responsive full-width |
| disable-turbo | true |
| browser-stats-url | https://api.github.com/_private/browser/stats |
| browser-errors-url | https://api.github.com/_private/browser/errors |
| release | 3d84d50b3c75fa36755c3cf392edbc09e626f979 |
| ui-target | full |
| theme-color | #1e2327 |
| color-scheme | light dark |
| Skip to content | https://github.com/python/cpython/pull/1959/files#start-of-content |
|
| https://github.com/ |
|
Sign in
| https://github.com/login?return_to=https%3A%2F%2Fgithub.com%2Fpython%2Fcpython%2Fpull%2F1959%2Ffiles |
| GitHub CopilotWrite better code with AI | https://github.com/features/copilot |
| GitHub SparkBuild and deploy intelligent apps | https://github.com/features/spark |
| GitHub ModelsManage and compare prompts | https://github.com/features/models |
| MCP RegistryNewIntegrate external tools | https://github.com/mcp |
| ActionsAutomate any workflow | https://github.com/features/actions |
| CodespacesInstant dev environments | https://github.com/features/codespaces |
| IssuesPlan and track work | https://github.com/features/issues |
| Code ReviewManage code changes | https://github.com/features/code-review |
| GitHub Advanced SecurityFind and fix vulnerabilities | https://github.com/security/advanced-security |
| Code securitySecure your code as you build | https://github.com/security/advanced-security/code-security |
| Secret protectionStop leaks before they start | https://github.com/security/advanced-security/secret-protection |
| Why GitHub | https://github.com/why-github |
| Documentation | https://docs.github.com |
| Blog | https://github.blog |
| Changelog | https://github.blog/changelog |
| Marketplace | https://github.com/marketplace |
| View all features | https://github.com/features |
| Enterprises | https://github.com/enterprise |
| Small and medium teams | https://github.com/team |
| Startups | https://github.com/enterprise/startups |
| Nonprofits | https://github.com/solutions/industry/nonprofits |
| App Modernization | https://github.com/solutions/use-case/app-modernization |
| DevSecOps | https://github.com/solutions/use-case/devsecops |
| DevOps | https://github.com/solutions/use-case/devops |
| CI/CD | https://github.com/solutions/use-case/ci-cd |
| View all use cases | https://github.com/solutions/use-case |
| Healthcare | https://github.com/solutions/industry/healthcare |
| Financial services | https://github.com/solutions/industry/financial-services |
| Manufacturing | https://github.com/solutions/industry/manufacturing |
| Government | https://github.com/solutions/industry/government |
| View all industries | https://github.com/solutions/industry |
| View all solutions | https://github.com/solutions |
| AI | https://github.com/resources/articles?topic=ai |
| Software Development | https://github.com/resources/articles?topic=software-development |
| DevOps | https://github.com/resources/articles?topic=devops |
| Security | https://github.com/resources/articles?topic=security |
| View all topics | https://github.com/resources/articles |
| Customer stories | https://github.com/customer-stories |
| Events & webinars | https://github.com/resources/events |
| Ebooks & reports | https://github.com/resources/whitepapers |
| Business insights | https://github.com/solutions/executive-insights |
| GitHub Skills | https://skills.github.com |
| Documentation | https://docs.github.com |
| Customer support | https://support.github.com |
| Community forum | https://github.com/orgs/community/discussions |
| Trust center | https://github.com/trust-center |
| Partners | https://github.com/partners |
| GitHub SponsorsFund open source developers | https://github.com/sponsors |
| Security Lab | https://securitylab.github.com |
| Maintainer Community | https://maintainers.github.com |
| Accelerator | https://github.com/accelerator |
| Archive Program | https://archiveprogram.github.com |
| Topics | https://github.com/topics |
| Trending | https://github.com/trending |
| Collections | https://github.com/collections |
| Enterprise platformAI-powered developer platform | https://github.com/enterprise |
| GitHub Advanced SecurityEnterprise-grade security features | https://github.com/security/advanced-security |
| Copilot for BusinessEnterprise-grade AI features | https://github.com/features/copilot/copilot-business |
| Premium SupportEnterprise-grade 24/7 support | https://github.com/premium-support |
| Pricing | https://github.com/pricing |
| Search syntax tips | https://docs.github.com/search-github/github-code-search/understanding-github-code-search-syntax |
| documentation | https://docs.github.com/search-github/github-code-search/understanding-github-code-search-syntax |
|
Sign in
| https://github.com/login?return_to=https%3A%2F%2Fgithub.com%2Fpython%2Fcpython%2Fpull%2F1959%2Ffiles |
|
Sign up
| https://github.com/signup?ref_cta=Sign+up&ref_loc=header+logged+out&ref_page=%2F%3Cuser-name%3E%2F%3Crepo-name%3E%2Fpull_requests%2Fshow%2Ffiles&source=header-repo&source_repo=python%2Fcpython |
| Reload | https://github.com/python/cpython/pull/1959/files |
| Reload | https://github.com/python/cpython/pull/1959/files |
| Reload | https://github.com/python/cpython/pull/1959/files |
|
python
| https://github.com/python |
| cpython | https://github.com/python/cpython |
| Please reload this page | https://github.com/python/cpython/pull/1959/files |
|
Notifications
| https://github.com/login?return_to=%2Fpython%2Fcpython |
|
Fork
33.9k
| https://github.com/login?return_to=%2Fpython%2Fcpython |
|
Star
71.1k
| https://github.com/login?return_to=%2Fpython%2Fcpython |
|
Code
| https://github.com/python/cpython |
|
Issues
5k+
| https://github.com/python/cpython/issues |
|
Pull requests
2.1k
| https://github.com/python/cpython/pulls |
|
Actions
| https://github.com/python/cpython/actions |
|
Projects
31
| https://github.com/python/cpython/projects |
|
Security
Uh oh!
There was an error while loading. Please reload this page.
| https://github.com/python/cpython/security |
| Please reload this page | https://github.com/python/cpython/pull/1959/files |
|
Insights
| https://github.com/python/cpython/pulse |
|
Code
| https://github.com/python/cpython |
|
Issues
| https://github.com/python/cpython/issues |
|
Pull requests
| https://github.com/python/cpython/pulls |
|
Actions
| https://github.com/python/cpython/actions |
|
Projects
| https://github.com/python/cpython/projects |
|
Security
| https://github.com/python/cpython/security |
|
Insights
| https://github.com/python/cpython/pulse |
| Sign up for GitHub
| https://github.com/signup?return_to=%2Fpython%2Fcpython%2Fissues%2Fnew%2Fchoose |
| terms of service | https://docs.github.com/terms |
| privacy statement | https://docs.github.com/privacy |
| Sign in | https://github.com/login?return_to=%2Fpython%2Fcpython%2Fissues%2Fnew%2Fchoose |
| serhiy-storchaka | https://github.com/serhiy-storchaka |
| python:master | https://github.com/python/cpython/tree/master |
| aaronchall:datadescrcontradiction | https://github.com/aaronchall/cpython/tree/datadescrcontradiction |
|
Conversation
20
| https://github.com/python/cpython/pull/1959 |
|
Commits
20
| https://github.com/python/cpython/pull/1959/commits |
|
Checks
0
| https://github.com/python/cpython/pull/1959/checks |
|
Files changed
| https://github.com/python/cpython/pull/1959/files |
| Please reload this page | https://github.com/python/cpython/pull/1959/files |
|
bpo-26103 resolve Data descriptor contradiction
| https://github.com/python/cpython/pull/1959/files#top |
|
Show all changes
20 commits
| https://github.com/python/cpython/pull/1959/files |
|
d9fd529
update documentation
aaronchall Jun 5, 2017
| https://github.com/python/cpython/pull/1959/commits/d9fd5297f4bb48994f4d35127730f987059fcead |
|
42a007b
update inspect function
aaronchall Jun 5, 2017
| https://github.com/python/cpython/pull/1959/commits/42a007bab50f64ad1fea25f147f33859e4a2da00 |
|
7d06227
add Misc/NEWS entry for abc.ABC slots
aaronchall Jun 6, 2017
| https://github.com/python/cpython/pull/1959/commits/7d06227bf13a92c99f52724cfc058302e5c71faf |
|
aada79a
add Misc/NEWS entry for inspect.isdatadescriptor
aaronchall Jun 6, 2017
| https://github.com/python/cpython/pull/1959/commits/aada79a2ab1ed6045d927ef51aa4cf23e7487679 |
|
7164f94
Merge branch 'datadescrcontradiction' of https://github.com/aaronchal…
aaronchall Jun 6, 2017
| https://github.com/python/cpython/pull/1959/commits/7164f9450d280aee8bb0f1395b432bfddd7adc08 |
|
0a993a1
Merge branch 'master' into datadescrcontradiction
aaronchall Jun 6, 2017
| https://github.com/python/cpython/pull/1959/commits/0a993a1106ed153bd00d32adb07ea8f54a5c1336 |
|
6aa2d87
add tests for isdatadescriptor custom, slots, property and functions
aaronchall Jun 6, 2017
| https://github.com/python/cpython/pull/1959/commits/6aa2d87bdb9b2f80b5e8f8629b1912ff4c0f0cbf |
|
dbc2c25
Merge branch 'datadescrcontradiction' of https://github.com/aaronchal…
aaronchall Jun 6, 2017
| https://github.com/python/cpython/pull/1959/commits/dbc2c25fe1bbf9c37961ee751573d7205831c3fa |
|
0858e03
add self to Misc/ACKS
aaronchall Jun 6, 2017
| https://github.com/python/cpython/pull/1959/commits/0858e03d1e9812f79e24431070faaf1aa720ed20 |
|
2439277
be more specific in test msg
aaronchall Jun 7, 2017
| https://github.com/python/cpython/pull/1959/commits/24392778a2c50e445de2b4b283df5c93dd8c9158 |
|
4bc76c9
clarify docstring
aaronchall Jun 7, 2017
| https://github.com/python/cpython/pull/1959/commits/4bc76c9c0c8da3670773e7e54678bdfde5016f7f |
|
ef3d4d3
clarify "or" is not exclusive
aaronchall Jun 7, 2017
| https://github.com/python/cpython/pull/1959/commits/ef3d4d3e0c76503d4ec10ed8d9f6c57b928b4f0d |
|
e2f767c
remove "either" - "or" is not exclusive
aaronchall Jun 7, 2017
| https://github.com/python/cpython/pull/1959/commits/e2f767cb463f8b76bb027a1a6c2fe0f7d00149d8 |
|
2ab592f
Enabled tests, tests passing, style fixes per request by Serhiy.
aaronchall Sep 14, 2017
| https://github.com/python/cpython/pull/1959/commits/2ab592f1ca3e9af17502a3022ba261c3e4739f67 |
|
2b0beab
Resolving conflict - learned updates go on top
aaronchall Sep 19, 2017
| https://github.com/python/cpython/pull/1959/commits/2b0beab2c7248c4dad7e9bd7994fecf54edd506b |
|
2f3ef81
when in Rome (change from issue to bpo-)
aaronchall Sep 19, 2017
| https://github.com/python/cpython/pull/1959/commits/2f3ef812461e886bb072b47d7f964d6af3a5b7b1 |
|
ed7caa7
remove entry - such entries go in News.d now
aaronchall Sep 22, 2017
| https://github.com/python/cpython/pull/1959/commits/ed7caa7ecaed46109c55f4aa73c66f32f6652c63 |
|
eb882ce
add blurb
aaronchall May 14, 2018
| https://github.com/python/cpython/pull/1959/commits/eb882ce705372914261db1f6af5584815667c8cd |
|
a69a525
change "and/or" to "or"
aaronchall May 20, 2018
| https://github.com/python/cpython/pull/1959/commits/a69a525c3183841734856167b83b98910cc1c6a7 |
|
a7af9f6
docstring - change "and/or" to "or"
aaronchall May 20, 2018
| https://github.com/python/cpython/pull/1959/commits/a7af9f6bdcbaa0cd395510026cb54cab62055037 |
|
Clear filters
| https://github.com/python/cpython/pull/1959/files |
| Please reload this page | https://github.com/python/cpython/pull/1959/files |
| Please reload this page | https://github.com/python/cpython/pull/1959/files |
|
descriptor.rst
| https://github.com/python/cpython/pull/1959/files#diff-cd5dc4415c95a8ebaa765e9bc0b42495d8614295044502499ec66333c1ed6df9 |
|
inspect.py
| https://github.com/python/cpython/pull/1959/files#diff-b89cd06e4637abacb73f2500301ff979a67ad7ecbfa7cf151c7243715898d7ea |
|
test_inspect.py
| https://github.com/python/cpython/pull/1959/files#diff-cd0b5ed704ccdad2d507d4f756ac2a9b391e0c9bbb5554baf851dbebd8b5e618 |
|
ACKS
| https://github.com/python/cpython/pull/1959/files#diff-d1243956feb505c5459fc05387e194609efb5c350cee202942be47ed30d7d7d0 |
|
2018-05-14-09-07-14.bpo-26103._zU8E2.rst
| https://github.com/python/cpython/pull/1959/files#diff-19d604fd019110d70c808aebe50aa19640d3ae6ea4cef78e092b9bae49efd8c2 |
| Doc/howto/descriptor.rst | https://github.com/python/cpython/pull/1959/files#diff-cd5dc4415c95a8ebaa765e9bc0b42495d8614295044502499ec66333c1ed6df9 |
|
View file
| https://github.com/aaronchall/cpython/blob/a7af9f6bdcbaa0cd395510026cb54cab62055037/Doc/howto/descriptor.rst |
|
Open in desktop
| https://desktop.github.com |
| https://github.co/hiddenchars |
| https://github.com/python/cpython/pull/1959/{{ revealButtonHref }} |
|
| https://github.com/python/cpython/pull/1959/files#diff-cd5dc4415c95a8ebaa765e9bc0b42495d8614295044502499ec66333c1ed6df9 |
|
| https://github.com/python/cpython/pull/1959/files#diff-cd5dc4415c95a8ebaa765e9bc0b42495d8614295044502499ec66333c1ed6df9 |
| Lib/inspect.py | https://github.com/python/cpython/pull/1959/files#diff-b89cd06e4637abacb73f2500301ff979a67ad7ecbfa7cf151c7243715898d7ea |
|
View file
| https://github.com/aaronchall/cpython/blob/a7af9f6bdcbaa0cd395510026cb54cab62055037/Lib/inspect.py |
|
Open in desktop
| https://desktop.github.com |
| https://github.co/hiddenchars |
| https://github.com/python/cpython/pull/1959/{{ revealButtonHref }} |
|
| https://github.com/python/cpython/pull/1959/files#diff-b89cd06e4637abacb73f2500301ff979a67ad7ecbfa7cf151c7243715898d7ea |
|
| https://github.com/python/cpython/pull/1959/files#diff-b89cd06e4637abacb73f2500301ff979a67ad7ecbfa7cf151c7243715898d7ea |
|
| https://github.com/python/cpython/pull/1959/files#diff-b89cd06e4637abacb73f2500301ff979a67ad7ecbfa7cf151c7243715898d7ea |
| Lib/test/test_inspect.py | https://github.com/python/cpython/pull/1959/files#diff-cd0b5ed704ccdad2d507d4f756ac2a9b391e0c9bbb5554baf851dbebd8b5e618 |
|
View file
| https://github.com/aaronchall/cpython/blob/a7af9f6bdcbaa0cd395510026cb54cab62055037/Lib/test/test_inspect.py |
|
Open in desktop
| https://desktop.github.com |
| https://github.co/hiddenchars |
| https://github.com/python/cpython/pull/1959/{{ revealButtonHref }} |
|
| https://github.com/python/cpython/pull/1959/files#diff-cd0b5ed704ccdad2d507d4f756ac2a9b391e0c9bbb5554baf851dbebd8b5e618 |
| serhiy-storchaka | https://github.com/serhiy-storchaka |
| Sep 12, 2017 | https://github.com/python/cpython/pull/1959/files#r138430895 |
| Learn more | https://docs.github.com/articles/managing-disruptive-comments/#hiding-a-comment |
| Please reload this page | https://github.com/python/cpython/pull/1959/files |
| aaronchall | https://github.com/aaronchall |
| Sep 19, 2017 | https://github.com/python/cpython/pull/1959/files#r139721887 |
| Learn more | https://docs.github.com/articles/managing-disruptive-comments/#hiding-a-comment |
| Please reload this page | https://github.com/python/cpython/pull/1959/files |
|
| https://github.com/python/cpython/pull/1959/files#diff-cd0b5ed704ccdad2d507d4f756ac2a9b391e0c9bbb5554baf851dbebd8b5e618 |
|
| https://github.com/python/cpython/pull/1959/files#diff-cd0b5ed704ccdad2d507d4f756ac2a9b391e0c9bbb5554baf851dbebd8b5e618 |
|
| https://github.com/python/cpython/pull/1959/files#diff-cd0b5ed704ccdad2d507d4f756ac2a9b391e0c9bbb5554baf851dbebd8b5e618 |
|
| https://github.com/python/cpython/pull/1959/files#diff-cd0b5ed704ccdad2d507d4f756ac2a9b391e0c9bbb5554baf851dbebd8b5e618 |
|
| https://github.com/python/cpython/pull/1959/files#diff-cd0b5ed704ccdad2d507d4f756ac2a9b391e0c9bbb5554baf851dbebd8b5e618 |
| Misc/ACKS | https://github.com/python/cpython/pull/1959/files#diff-d1243956feb505c5459fc05387e194609efb5c350cee202942be47ed30d7d7d0 |
|
View file
| https://github.com/aaronchall/cpython/blob/a7af9f6bdcbaa0cd395510026cb54cab62055037/Misc/ACKS |
|
Open in desktop
| https://desktop.github.com |
| https://github.co/hiddenchars |
| https://github.com/python/cpython/pull/1959/{{ revealButtonHref }} |
|
| https://github.com/python/cpython/pull/1959/files#diff-d1243956feb505c5459fc05387e194609efb5c350cee202942be47ed30d7d7d0 |
|
| https://github.com/python/cpython/pull/1959/files#diff-d1243956feb505c5459fc05387e194609efb5c350cee202942be47ed30d7d7d0 |
| Misc/NEWS.d/next/Library/2018-05-14-09-07-14.bpo-26103._zU8E2.rst | https://github.com/python/cpython/pull/1959/files#diff-19d604fd019110d70c808aebe50aa19640d3ae6ea4cef78e092b9bae49efd8c2 |
|
View file
| https://github.com/aaronchall/cpython/blob/a7af9f6bdcbaa0cd395510026cb54cab62055037/Misc/NEWS.d/next/Library/2018-05-14-09-07-14.bpo-26103._zU8E2.rst |
|
Open in desktop
| https://desktop.github.com |
| https://github.co/hiddenchars |
| https://github.com/python/cpython/pull/1959/{{ revealButtonHref }} |
|
| https://github.com |
| Terms | https://docs.github.com/site-policy/github-terms/github-terms-of-service |
| Privacy | https://docs.github.com/site-policy/privacy-policies/github-privacy-statement |
| Security | https://github.com/security |
| Status | https://www.githubstatus.com/ |
| Community | https://github.community/ |
| Docs | https://docs.github.com/ |
| Contact | https://support.github.com?tags=dotcom-footer |