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.
........
This commit is contained in:
Matthias Klose 2010-08-05 16:35:53 +00:00
parent 498323eec7
commit 9b83dbe905
2 changed files with 6 additions and 1 deletions

View file

@ -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?
================================

View file

@ -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) {