Commit 9b83dbe9 authored by Matthias Klose's avatar Matthias Klose

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.
........
parent 498323ee
...@@ -15,6 +15,11 @@ Library ...@@ -15,6 +15,11 @@ Library
- Issue #5798: Handle select.poll flag oddities properly on OS X. - Issue #5798: Handle select.poll flag oddities properly on OS X.
This fixes test_asynchat and test_smtplib failures 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? What's New in Python 2.6.6 rc 1?
================================ ================================
......
...@@ -2039,7 +2039,7 @@ PyCursesWindow_NoOutRefresh(PyCursesWindowObject *self, PyObject *args) ...@@ -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"; char* s = "setupterm: unknown error";
if (err == 0) { if (err == 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment