Merged revisions 69460,69467,69470 via svnmerge from
svn+ssh://pythondev/python/trunk

........
  r69460 | guilherme.polo | 2009-02-09 14:09:17 -0200 (Mon, 09 Feb 2009) | 1 line

  Turned setup_master public
........
  r69467 | guilherme.polo | 2009-02-09 17:21:21 -0200 (Mon, 09 Feb 2009) | 2 lines

  Some tests for Tkinter.Text.search
........
  r69470 | guilherme.polo | 2009-02-09 17:57:04 -0200 (Mon, 09 Feb 2009) | 1 line

  Checking for tk availability before continuing (basically the same that is done in test_ttk_guionly)
........
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 8ab0e48..203bd95 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -1075,6 +1075,7 @@
         test_pty
         test_socketserver
         test_tcl
+        test_tk
         test_ttk_guionly
         test_ttk_textonly
         test_timeout
@@ -1092,6 +1093,7 @@
         test_kqueue
         test_ossaudiodev
         test_tcl
+        test_tk
         test_ttk_guionly
         test_ttk_textonly
         test_zipimport
@@ -1109,6 +1111,7 @@
         test_ossaudiodev
         test_pep277
         test_tcl
+        test_tk
         test_ttk_guionly
         test_ttk_textonly
         test_multiprocessing
@@ -1125,6 +1128,7 @@
         test_ossaudiodev
         test_pep277
         test_tcl
+        test_tk
         test_ttk_guionly
         test_ttk_textonly
         test_multiprocessing