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

[andrew.kuchling]

Author: andrew.kuchling
Date: Mon Feb 22 17:59:30 2010
New Revision: 78323

Log:
Merged revisions 78322 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78322 | andrew.kuchling | 2010-02-22 11:52:52 -0500 (Mon, 22 Feb 2010) | 9 lines
  
  Merged revisions 78318 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r78318 | andrew.kuchling | 2010-02-22 11:26:47 -0500 (Mon, 22 Feb 2010) | 1 line
    
    #7597: curses.use_env() can be called before initscr().  Noted by Kan-Ru Chen
  ........
................


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

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Mon Feb 22 17:59:30 2010
@@ -79,6 +79,9 @@
 Library
 -------
 
+- Issue #7597: curses.use_env() can now be called before initscr().
+  Noted by Kan-Ru Chen.
+
 - Issue #7310: fix the __repr__ of os.environ to show the environment variables.
 
 - Issue #7970: email.Generator.flatten now correctly flattens message/rfc822

Modified: python/branches/release31-maint/Modules/_cursesmodule.c
==============================================================================
--- python/branches/release31-maint/Modules/_cursesmodule.c	(original)
+++ python/branches/release31-maint/Modules/_cursesmodule.c	Mon Feb 22 17:59:30 2010
@@ -2659,8 +2659,6 @@
 {
   int flag;
 
-  PyCursesInitialised
-
   switch(PyTuple_Size(args)) {
   case 1:
     if (!PyArg_ParseTuple(args,"i;True(1), False(0)",&flag))