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

[matthias.klose]

Author: matthias.klose
Date: Fri Jul 30 23:27:18 2010
New Revision: 83306

Log:
- Issue #7567: Don't call `setupterm' twice.


Modified:
   python/branches/release27-maint/Misc/NEWS
   python/branches/release27-maint/Modules/_cursesmodule.c

Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Fri Jul 30 23:27:18 2010
@@ -78,6 +78,8 @@
   then that exception wasn't properly propagated on machines where
   char is unsigned.
 
+- Issue #7567: Don't call `setupterm' twice.
+
 Build
 -----
 

Modified: python/branches/release27-maint/Modules/_cursesmodule.c
==============================================================================
--- python/branches/release27-maint/Modules/_cursesmodule.c	(original)
+++ python/branches/release27-maint/Modules/_cursesmodule.c	Fri Jul 30 23:27:18 2010
@@ -2047,7 +2047,7 @@
         }
     }
 
-    if (setupterm(termstr,fd,&err) == ERR) {
+    if (!initialised_setupterm && setupterm(termstr,fd,&err) == ERR) {
         char* s = "setupterm: unknown error";
 
         if (err == 0) {