Merged revisions 83306 via svnmerge from
authorMatthias Klose <doko@ubuntu.com>
Thu, 5 Aug 2010 16:35:53 +0000 (16:35 +0000)
committerMatthias Klose <doko@ubuntu.com>
Thu, 5 Aug 2010 16:35:53 +0000 (16:35 +0000)
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.
........

Misc/NEWS
Modules/_cursesmodule.c

index 7c774c75e408ddc784348ea8d6350f4b2de0f270..f278b26732739a92e19d05892822b7ce32312840 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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?
 ================================
index a3146f8263df8218a216f77646e3a877c2ea6852..fb833bc1080a73594a6a326cd34012c938bb6d43 100644 (file)
@@ -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) {