diff options
| author | Georg Brandl <georg@python.org> | 2010-11-26 08:59:40 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-11-26 08:59:40 (GMT) |
| commit | f55aa80b372268902d27ad8ae3a45e465c6b9b19 (patch) | |
| tree | c8dd7533c37a9d1e49350aadf5aa32c6672102bb /Tools/pynche | |
| parent | d62ecbf0bae673af61fb87d8932cdb1ea80e8922 (diff) | |
| download | cpython-f55aa80b372268902d27ad8ae3a45e465c6b9b19.zip cpython-f55aa80b372268902d27ad8ae3a45e465c6b9b19.tar.gz cpython-f55aa80b372268902d27ad8ae3a45e465c6b9b19.tar.bz2 | |
Merged revisions 85820,85823,85825,85840,85843-85845,85849-85851,85855,85867,85875,85907-85908,85911,85914 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r85820 | georg.brandl | 2010-10-24 16:20:22 +0200 (So, 24 Okt 2010) | 1 line
Remove usage of exception indexing.
........
r85823 | georg.brandl | 2010-10-24 16:32:45 +0200 (So, 24 Okt 2010) | 1 line
Fix style.
........
r85825 | georg.brandl | 2010-10-24 17:16:02 +0200 (So, 24 Okt 2010) | 1 line
Add documentation about the default warnings filters.
........
r85840 | georg.brandl | 2010-10-25 19:50:20 +0200 (Mo, 25 Okt 2010) | 1 line
#3018: tkinter demo fixes for py3k.
........
r85843 | georg.brandl | 2010-10-26 08:59:23 +0200 (Di, 26 Okt 2010) | 1 line
Markup fix.
........
r85844 | georg.brandl | 2010-10-26 12:39:14 +0200 (Di, 26 Okt 2010) | 1 line
Work a bit more on tkinter demos.
........
r85845 | georg.brandl | 2010-10-26 12:42:16 +0200 (Di, 26 Okt 2010) | 1 line
faqwiz is removed.
........
r85849 | georg.brandl | 2010-10-26 21:31:06 +0200 (Di, 26 Okt 2010) | 1 line
#10200: typo.
........
r85850 | georg.brandl | 2010-10-26 21:58:11 +0200 (Di, 26 Okt 2010) | 1 line
#10200: typo.
........
r85851 | georg.brandl | 2010-10-26 22:12:37 +0200 (Di, 26 Okt 2010) | 1 line
Fix import.
........
r85855 | georg.brandl | 2010-10-27 09:21:54 +0200 (Mi, 27 Okt 2010) | 1 line
Encoding fix.
........
r85867 | georg.brandl | 2010-10-27 22:01:51 +0200 (Mi, 27 Okt 2010) | 1 line
Add David.
........
r85875 | georg.brandl | 2010-10-28 10:38:30 +0200 (Do, 28 Okt 2010) | 1 line
Fix bytes/str issues in get-remote-certificate.py.
........
r85907 | georg.brandl | 2010-10-29 06:54:13 +0200 (Fr, 29 Okt 2010) | 1 line
#10222: fix for overzealous AIX compiler.
........
r85908 | georg.brandl | 2010-10-29 07:22:17 +0200 (Fr, 29 Okt 2010) | 1 line
send_bytes obviously needs bytes...
........
r85911 | georg.brandl | 2010-10-29 07:36:28 +0200 (Fr, 29 Okt 2010) | 1 line
Fix markup error and update false positive entries from "make suspicious".
........
r85914 | georg.brandl | 2010-10-29 08:17:38 +0200 (Fr, 29 Okt 2010) | 1 line
(?:...) is a non-capturing, but still grouping construct.
........
Diffstat (limited to 'Tools/pynche')
| -rw-r--r-- | Tools/pynche/pyColorChooser.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tools/pynche/pyColorChooser.py b/Tools/pynche/pyColorChooser.py index 9507847..3286047 100644 --- a/Tools/pynche/pyColorChooser.py +++ b/Tools/pynche/pyColorChooser.py @@ -31,7 +31,7 @@ class Chooser: if dbfile != self.__databasefile: colordb = ColorDB.get_colordb(dbfile) if not self.__master: - from Tkinter import Tk + from tkinter import Tk self.__master = Tk() if not self.__pw: self.__pw, self.__sb = \ @@ -92,7 +92,7 @@ def save(): # test stuff if __name__ == '__main__': - from Tkinter import * + from tkinter import * class Tester: def __init__(self): |