summaryrefslogtreecommitdiffstats
path: root/Lib/tkinter
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2014-10-09 22:45:07 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2014-10-09 22:45:07 (GMT)
commite66dc2aecc8f9e7c026562bb3a3e6ea85927477a (patch)
tree31f24e0885c272e86f1e30085edc1b946d4debc8 /Lib/tkinter
parentd42c4282b91375a108811aa92e9fe71f62c113b9 (diff)
parent867579972d9a1e9e077626de6d6d083e30fea110 (diff)
downloadcpython-e66dc2aecc8f9e7c026562bb3a3e6ea85927477a.zip
cpython-e66dc2aecc8f9e7c026562bb3a3e6ea85927477a.tar.gz
cpython-e66dc2aecc8f9e7c026562bb3a3e6ea85927477a.tar.bz2
Merge with 3.4: decolourize
Diffstat (limited to 'Lib/tkinter')
-rw-r--r--Lib/tkinter/colorchooser.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/tkinter/colorchooser.py b/Lib/tkinter/colorchooser.py
index 6027067..9dc9671 100644
--- a/Lib/tkinter/colorchooser.py
+++ b/Lib/tkinter/colorchooser.py
@@ -1,4 +1,4 @@
-# tk common colour chooser dialogue
+# tk common color chooser dialogue
#
# this module provides an interface to the native color dialogue
# available in Tk 4.2 and newer.
@@ -11,7 +11,7 @@
#
# options (all have default values):
#
-# - initialcolor: colour to mark as selected when dialog is displayed
+# - initialcolor: color to mark as selected when dialog is displayed
# (given as an RGB triplet or a Tk color string)
#
# - parent: which window to place the dialog on top of