From: Ned Deily <nad@acm.org>
Date: Tue, 5 Jul 2011 22:09:32 +0000 (-0700)
Subject: Issue #8716: Back out temporary changeset 18ce15f841cf
X-Git-Tag: v2.7.3rc1~630
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=09f6ab0d0fd10dfadae3de5896805157e73323b0;p=thirdparty%2FPython%2Fcpython.git

Issue #8716: Back out temporary changeset 18ce15f841cf
---

diff --git a/Lib/lib-tk/test/runtktests.py b/Lib/lib-tk/test/runtktests.py
index 96cb31d14af3..19769adac72a 100644
--- a/Lib/lib-tk/test/runtktests.py
+++ b/Lib/lib-tk/test/runtktests.py
@@ -25,20 +25,6 @@ def check_tk_availability():
         return
 
     if sys.platform == 'darwin':
-
-        # ** temporary test code for issue8716 **
-        try:
-            import MacOS
-            wma = MacOS.WMAvailable()
-            print >> test.test_support.get_original_stdout(), \
-                '\tcheck_tk_availability -- WMAvailable returned %r' % wma
-        except ImportError:
-            print >> test.test_support.get_original_stdout(), \
-                '\tcheck_tk_availability -- could not import MacOS'
-        if not wma:
-            raise unittest.SkipTest("Window manager is not available")
-        # ** end of temporary test code for issue8716 **
-
         # The Aqua Tk implementations on OS X can abort the process if
         # being called in an environment where a window server connection
         # cannot be made, for instance when invoked by a buildbot or ssh