Skip to content
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

Jump to bottom

bpo-33283: Mention PNG as a supported format by Tcl/Tk #6479

Merged
merged 4 commits into from
Apr 17, 2018
Merged

bpo-33283: Mention PNG as a supported format by Tcl/Tk #6479

merged 4 commits into from
Apr 17, 2018

Conversation

andresdelfino
Copy link
Contributor

@andresdelfino andresdelfino commented Apr 15, 2018 •
edited by bedevere-bot
Loading

terryjreedy
terryjreedy requested changes Apr 15, 2018
View reviewed changes
Copy link
Member

@terryjreedy terryjreedy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I highly approve of adding the information.

Doc/library/tkinter.rst Outdated
@@ -788,7 +788,8 @@ Bitmap/Pixelmap images can be created through the subclasses of

* :class:`BitmapImage` can be used for X11 bitmap data.

* :class:`PhotoImage` can be used for GIF and PPM/PGM color bitmaps.
* :class:`PhotoImage` can be used for GIF and PPM/PGM bitmaps. This class can
also be used for PNG bitmaps starting with Tcl/Tk 8.6.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know why 'bitmap' is used for image files. Compressed files are not bitmaps as I understand the term. So I think this should say (without the markup)

class PhotoImage can be used with GIF and PPM/PGM files. PNG files can also be used, starting with Tcl/Tk 8.6.

Or replace 'file' with 'format' or 'data'.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you think about:

class PhotoImage can be used for GIF and PPM/PGM data. PNG data is also supported, starting with Tcl/Tk 8.6.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Lets see when Serhiy thinks.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would write something like: "... for images in PPM/PGM, GIF and PNG formats. The latter is only supported in Tk 8.6."

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree. I'll update the PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a small change: "... for images in PPM/PGM, GIF and PNG formats. The latter is supported starting with Tk 8.6."

To be correct regarding the upcoming 8.7.

ok?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM even better.

@bedevere-bot
Copy link

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

@andresdelfino
Copy link
Contributor Author

I have made the requested changes; please review again

@bedevere-bot
Copy link

Thanks for making the requested changes!

@terryjreedy: please review the changes made to this pull request.

@serhiy-storchaka serhiy-storchaka merged commit 4b685bf into python:master Apr 17, 2018
@miss-islington
Copy link
Contributor

Thanks @andresdelfino for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 2.7, 3.6, 3.7.
🐍🍒⛏🤖

@bedevere-bot
Copy link

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Apr 17, 2018
@andresdelfino @miss-islington
bpo-33283: Mention PNG as a supported format by Tcl/Tk. (pythonGH-6479)
5d52a7e 
(cherry picked from commit 4b685bf)

Co-authored-by: Andrés Delfino <34587441+andresdelfino@users.noreply.github.com>
@miss-islington
Copy link
Contributor

Sorry, @andresdelfino and @serhiy-storchaka, I could not cleanly backport this to 2.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 4b685bf7192fff48c8effeeae4f4d64f9420ec0f 2.7

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Apr 17, 2018
@andresdelfino @miss-islington
bpo-33283: Mention PNG as a supported format by Tcl/Tk. (pythonGH-6479)
5fcb5ec 
(cherry picked from commit 4b685bf)

Co-authored-by: Andrés Delfino <34587441+andresdelfino@users.noreply.github.com>
@bedevere-bot
Copy link

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

miss-islington added a commit that referenced this pull request Apr 17, 2018
@miss-islington @andresdelfino
bpo-33283: Mention PNG as a supported format by Tcl/Tk. (GH-6479)
f44ce35 
(cherry picked from commit 4b685bf)

Co-authored-by: Andrés Delfino <34587441+andresdelfino@users.noreply.github.com>
@andresdelfino andresdelfino deleted the tcltk_png branch April 17, 2018 10:35
@miss-islington
Copy link
Contributor

Thanks @andresdelfino for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 3.7.
🐍🍒⛏🤖

@bedevere-bot
Copy link

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

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Apr 18, 2018
@andresdelfino @miss-islington
bpo-33283: Mention PNG as a supported format by Tcl/Tk. (pythonGH-6479)
8d65579 
(cherry picked from commit 4b685bf)

Co-authored-by: Andrés Delfino <34587441+andresdelfino@users.noreply.github.com>
miss-islington added a commit that referenced this pull request Apr 18, 2018
@miss-islington @andresdelfino
bpo-33283: Mention PNG as a supported format by Tcl/Tk. (GH-6479)
b88f737 
(cherry picked from commit 4b685bf)

Co-authored-by: Andrés Delfino <34587441+andresdelfino@users.noreply.github.com>
@serhiy-storchaka
Copy link
Member

Do you mind to make a backport to 2.7 @andresdelfino?

@andresdelfino
Copy link
Contributor Author

Sure, @serhiy-storchaka !

Must I start a new pull request like I did for master? Based on 2.7, of course. I'm new to Git :P

@serhiy-storchaka
Copy link
Member

You can use the cherry_picker command mentioned above: cherry_picker 4b685bf7192fff48c8effeeae4f4d64f9420ec0f 2.7.

It will fail due to conflicts. After resolving conflicts add modified files by git add and run cherry_picker --continue. This should open a web page for creating a new PR.

@andresdelfino
Copy link
Contributor Author

Great! I'll fix an issue I'm having that prevents me from installing packages with pip, and I'll make the backport.

@andresdelfino
Copy link
Contributor Author

I had problems following the cherry-picker path. Had to end the process manually, here's the PR:

#6542

Hope it helps.

serhiy-storchaka pushed a commit that referenced this pull request Apr 20, 2018
@andresdelfino @serhiy-storchaka
bpo-33283: Mention PNG as a supported format by Tcl/Tk. (GH-6479) (GH…
7a45eb9 
…-6542)

(cherry picked from commit 4b685bf)

Update only the documentation about image formats.
@bedevere-bot
Copy link

GH-6542 is a backport of this pull request to the 2.7 branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@terryjreedy terryjreedy terryjreedy approved these changes

@serhiy-storchaka serhiy-storchaka Awaiting requested review from serhiy-storchaka

Assignees
No one assigned
Labels
docs Documentation in the Doc dir skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@andresdelfino @bedevere-bot @miss-islington @serhiy-storchaka @terryjreedy @the-knights-who-say-ni