◐ Shell
reader mode source ↗
Skip to content

bpo-32769: A new take on annotations/type hinting glossary entries#6829

Merged
ilevkivskyi merged 25 commits into
python:masterfrom
andresdelfino:type-hints
May 26, 2018
Merged

bpo-32769: A new take on annotations/type hinting glossary entries#6829
ilevkivskyi merged 25 commits into
python:masterfrom
andresdelfino:type-hints

Conversation

@andresdelfino

@andresdelfino andresdelfino commented May 14, 2018 •
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Contributor

@andresdelfino
Minor fix
dd61e97
@andresdelfino
Fix term links, emphasize on the word 'expected', change 'stored' to … …
70106b4 
…'defined via'
@andresdelfino
Add local variable annotations comment
e5189e9
@andresdelfino
Be consistent with singular
e6c4d44
@andresdelfino
Remove 'global' from variable annotations entry
399021c
@andresdelfino
Minor change
084a08b
@andresdelfino
Fix single colons
c192e04
@andresdelfino
Fix doble colons
ec67b1e
@andresdelfino
Move local variable comment to variable annotation term
3349efe
@andresdelfino
Separate annotation syntax examples from type hinting
61fac0b
@andresdelfino
Remove 'global' from type hints
41674e3
@andresdelfino
Clarify local annotations
9b1721c
@andresdelfino
Change class variable to class attribute on type hint
6c51318
@andresdelfino
Be consistent with plurals
4a5b6be
@andresdelfino
Try to make it clear that type hints are one use of annotations, and … …
8178119 
…that annotations are not a runtime-only concept
@andresdelfino
Minor fix
a32ffbc
@andresdelfino
Another minor fix
a88cebb
@andresdelfino
Add type alias definition, plus minor changes
ce6d127
@andresdelfino

andresdelfino commented May 20, 2018

Copy link
Copy Markdown
Contributor Author

@ilevkivskyi I would really appreciate any input, when you have some spare time of course.

ilevkivskyi
ilevkivskyi reviewed May 25, 2018
View reviewed changes

@ilevkivskyi ilevkivskyi left a comment

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.

Hide comment

Sorry, I lost track a bit, here are few superficial comments. I would rather ask @gvanrossum to take a look at wording here (if he has bandwidth of course).

gvanrossum
gvanrossum reviewed May 25, 2018
View reviewed changes
7 hidden conversations Load more…
12 hidden items Load more…
gvanrossum
gvanrossum reviewed May 25, 2018
View reviewed changes

@gvanrossum gvanrossum left a comment

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.

Hide comment

ALmost there.

@ilevkivskyi ilevkivskyi merged commit 6e33f81 into python:master May 26, 2018
@miss-islington

miss-islington commented May 26, 2018

Copy link
Copy Markdown
Contributor

Thanks @andresdelfino for the PR, and @ilevkivskyi for merging it 🌮🎉.. I'm working now to backport this PR to: 3.6, 3.7.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

@miss-islington

miss-islington commented May 26, 2018

Copy link
Copy Markdown
Contributor

Sorry, @andresdelfino and @ilevkivskyi, I could not cleanly backport this to 3.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 6e33f810c9e3a549c9379f24cf1d1752c29195f0 3.7

@miss-islington

miss-islington commented May 26, 2018

Copy link
Copy Markdown
Contributor

Sorry, @andresdelfino and @ilevkivskyi, I could not cleanly backport this to 3.6 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 6e33f810c9e3a549c9379f24cf1d1752c29195f0 3.6

@ilevkivskyi

ilevkivskyi commented May 26, 2018

Copy link
Copy Markdown
Member

@andresdelfino Could you please make manual backports of these changes? (Make PRs against 3.6 and 3.7 branches).

@andresdelfino

andresdelfino commented May 26, 2018

Copy link
Copy Markdown
Contributor Author

Yes, I was working on them already :)

@andresdelfino andresdelfino deleted the type-hints branch May 26, 2018 12:50
andresdelfino added a commit to andresdelfino/cpython that referenced this pull request May 26, 2018
@andresdelfino
[3.7] bpo-32769: A new take on annotations/type hinting glossary entr… …
d981541 
…ies (pythonGH-6829).

(cherry picked from commit 6e33f81)

Co-authored-by: Andrés Delfino <adelfino@gmail.com>
@bedevere-bot

bedevere-bot commented May 26, 2018

Copy link
Copy Markdown

GH-7127 is a backport of this pull request to the 3.7 branch.

andresdelfino added a commit to andresdelfino/cpython that referenced this pull request May 26, 2018
@andresdelfino
[3.6] bpo-32769: A new take on annotations/type hinting glossary entr… …
d60f4dd 
…ies (pythonGH-6829).

(cherry picked from commit 6e33f81)

Co-authored-by: Andrés Delfino <adelfino@gmail.com>
@bedevere-bot

bedevere-bot commented May 26, 2018

Copy link
Copy Markdown

GH-7128 is a backport of this pull request to the 3.6 branch.

gvanrossum pushed a commit that referenced this pull request May 26, 2018
@andresdelfino @gvanrossum
[3.7] bpo-32769: A new take on annotations/type hinting glossary entr… …
e69657d 
…ies (GH-6829) (#7127)

(cherry picked from commit 6e33f81)

Co-authored-by: Andrés Delfino <adelfino@gmail.com>
@andresdelfino andresdelfino mentioned this pull request May 26, 2018
Merged
ilevkivskyi pushed a commit that referenced this pull request May 26, 2018
@andresdelfino @ilevkivskyi
[3.6] bpo-32769: A new take on annotations/type hinting glossary entr… …
717204f 
…ies (GH-6829) (GH-7128)

* [3.6] bpo-32769: A new take on annotations/type hinting glossary entries (GH-6829).
(cherry picked from commit 6e33f81)

Co-authored-by: Andrés Delfino <adelfino@gmail.com>

* Typo fix spotted by Guido
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@gvanrossum gvanrossum gvanrossum approved these changes

@ilevkivskyi ilevkivskyi ilevkivskyi approved these changes

Assignees

@ilevkivskyi ilevkivskyi

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@andresdelfino @miss-islington @ilevkivskyi @bedevere-bot @gvanrossum @the-knights-who-say-ni