From b88f73749db98ed62dbc8fa59480aa62202e25d7 Mon Sep 17 00:00:00 2001
From: "Miss Islington (bot)"
 <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 18 Apr 2018 11:16:46 -0700
Subject: [PATCH] bpo-33283: Mention PNG as a supported format by Tcl/Tk.
 (GH-6479)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 4b685bf7192fff48c8effeeae4f4d64f9420ec0f)

Co-authored-by: Andrés Delfino <34587441+andresdelfino@users.noreply.github.com>
---
 Doc/library/tkinter.rst | 9 +++++----
 Lib/tkinter/__init__.py | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index 6d90e43e33b..b99dc8ec276 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -783,12 +783,13 @@ Menu indexes (menu.invoke(), menu.entryconfig(), etc.)
 Images
 ^^^^^^
 
-Bitmap/Pixelmap images can be created through the subclasses of
-:class:`tkinter.Image`:
+Images of different formats can be created through the corresponding subclass
+of :class:`tkinter.Image`:
 
-* :class:`BitmapImage` can be used for X11 bitmap data.
+* :class:`BitmapImage` for images in XBM format.
 
-* :class:`PhotoImage` can be used for GIF and PPM/PGM color bitmaps.
+* :class:`PhotoImage` for images in PGM, PPM, GIF and PNG formats. The latter
+  is supported starting with Tk 8.6.
 
 Either type of image is created through either the ``file`` or the ``data``
 option (other options are available as well).
diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py
index 53bad3fa95a..b78191e2777 100644
--- a/Lib/tkinter/__init__.py
+++ b/Lib/tkinter/__init__.py
@@ -3533,7 +3533,7 @@ class Image:
             self.tk.call('image', 'width', self.name))
 
 class PhotoImage(Image):
-    """Widget which can display colored images in GIF, PPM/PGM format."""
+    """Widget which can display images in PGM, PPM, GIF, PNG format."""
     def __init__(self, name=None, cnf={}, master=None, **kw):
         """Create an image with NAME.
 
@@ -3597,7 +3597,7 @@ class PhotoImage(Image):
         self.tk.call(args)
 
 class BitmapImage(Image):
-    """Widget which can display a bitmap."""
+    """Widget which can display images in XBM format."""
     def __init__(self, name=None, cnf={}, master=None, **kw):
         """Create a bitmap with NAME.