[Python-checkins] r83307 - in python/branches/py3k: Misc/NEWS Modules/_cursesmodule.c

30 Jul 2010

Author: matthias.klose
Date: Fri Jul 30 23:40:57 2010
New Revision: 83307

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


Modified:
   python/branches/py3k/Misc/NEWS
   python/branches/py3k/Modules/_cursesmodule.c

Modified: python/branches/py3k/Misc/NEWS
==============================================================================

--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Fri Jul 30 23:40:57 2010
@@ -1673,6 +1673,8 @@
 - Issue #7347: winreg: Add CreateKeyEx and DeleteKeyEx, as well as fix a
   bug in the return value of QueryReflectionKey.
 
+- Issue #7567: PyCurses_setupterm: Don't call `setupterm' twice.
+
 Build
 -----
 

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

    