Clean up test_curses.

By using __stdout__ directly, test_curses caused regrtest.py
to duplicate the output of some test results.

diff --git a/Lib/test/test_curses.py b/Lib/test/test_curses.py
index bf60daa9dc5849d04f934be904f1a696d72dbd61..4be2029fabdf1631b86736ce669d8a7b471719d6 100644 (file)
--- a/Lib/test/test_curses.py
+++ b/Lib/test/test_curses.py
@@ -269,16 +269,17 @@ def main(stdscr):
     finally:
         curses.resetty()
 
-if __name__ == '__main__':
-    curses.wrapper(main)
-    unit_tests()
-else:
+def test_main():
     # testing setupterm() inside initscr/endwin
     # causes terminal breakage
-    curses.setupterm(fd=sys.__stdout__.fileno())
+    curses.setupterm(fd=sys.stdout.fileno())
     try:
         stdscr = curses.initscr()
         main(stdscr)
     finally:
         curses.endwin()
     unit_tests()
+
+if __name__ == '__main__':
+    curses.wrapper(main)
+    unit_tests()