[Python-checkins] r83743 - in python/branches/release26-maint: Misc/NEWS Modules/_cursesmodule.c

[matthias.klose]

Author: matthias.klose
Date: Thu Aug  5 18:35:53 2010
New Revision: 83743

Log:
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.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Misc/NEWS
   python/branches/release26-maint/Modules/_cursesmodule.c

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Thu Aug  5 18:35:53 2010
@@ -15,6 +15,11 @@
 - 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?
 ================================

Modified: python/branches/release26-maint/Modules/_cursesmodule.c
==============================================================================
--- python/branches/release26-maint/Modules/_cursesmodule.c	(original)
+++ python/branches/release26-maint/Modules/_cursesmodule.c	Thu Aug  5 18:35:53 2010
@@ -2039,7 +2039,7 @@
                 }
             }
 
-            if (setupterm(termstr,fd,&err) == ERR) {
+            if (!initialised_setupterm && setupterm(termstr,fd,&err) == ERR) {
                 char* s = "setupterm: unknown error";
 
                 if (err == 0) {