diff options
| author | Matthias Klose <doko@ubuntu.com> | 2010-08-05 16:35:53 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@ubuntu.com> | 2010-08-05 16:35:53 +0000 |
| commit | 9b52db26e1ad4d30faebc8cdd268804e4e63f5d4 (patch) | |
| tree | ac987c6bb428739e20d4a0f96f4f9f56def41469 | |
| parent | 0e5ba408791b4536993b50c5e27121b18a3542d9 (diff) | |
| download | cpython-9b52db26e1ad4d30faebc8cdd268804e4e63f5d4.tar.gz | |
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.
........
| -rw-r--r-- | Misc/NEWS | 5 | ||||
| -rw-r--r-- | Modules/_cursesmodule.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -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) { |