From 9b83dbe9056face0a66dbff537aa866ea6f57f35 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Thu, 5 Aug 2010 16:35:53 +0000 Subject: [PATCH] Merged revisions 83306 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/release27-maint ........ r83306 | matthias.klose | 2010-07-30 23:27:18 +0200 (Fr, 30 Jul 2010) | 2 lines - Issue #7567: Don't call `setupterm' twice. ........ --- Misc/NEWS | 5 +++++ Modules/_cursesmodule.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index 7c774c75e4..f278b26732 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -15,6 +15,11 @@ Library - Issue #5798: Handle select.poll flag oddities properly on OS X. This fixes test_asynchat and test_smtplib failures on OS X. +Extension Modules +----------------- + +- Issue #7567: Don't call `setupterm' twice. + What's New in Python 2.6.6 rc 1? ================================ diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c index a3146f8263..fb833bc108 100644 --- a/Modules/_cursesmodule.c +++ b/Modules/_cursesmodule.c @@ -2039,7 +2039,7 @@ PyCursesWindow_NoOutRefresh(PyCursesWindowObject *self, PyObject *args) } } - if (setupterm(termstr,fd,&err) == ERR) { + if (!initialised_setupterm && setupterm(termstr,fd,&err) == ERR) { char* s = "setupterm: unknown error"; if (err == 0) { -- 2.50.1