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

diff --git a/Misc/NEWS b/Misc/NEWS
index a9069c08741480143e14662f5c956864f47a04a2..589590e266f6e6d65f7b1332cbd95b80f4fd2558 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -66,6 +66,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #7597: curses.use_env() can now be called before initscr().
+  Noted by Kan-Ru Chen.
+
 - Issue #7970: email.Generator.flatten now correctly flattens message/rfc822
   messages parsed by email.Parser.HeaderParser.
 

diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index 922f351e429d5865914ae8e3f024f7a14ce40b2a..4a77b0552ad1d83f9084fb9bae9f1d8a230e6f3d 100644 (file)
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -2586,8 +2586,6 @@ PyCurses_Use_Env(PyObject *self, PyObject *args)
 {
   int flag;
 
-  PyCursesInitialised
-
   switch(PyTuple_Size(args)) {
   case 1:
     if (!PyArg_ParseTuple(args,"i;True(1), False(0)",&flag))