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

diff --git a/Misc/NEWS b/Misc/NEWS
index 9f1b145af565061a598d79a64f886b39bc088d71..5bd32fb277dbfa9e83937ed9c18ae42e4606a536 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -79,6 +79,9 @@ Core and Builtins
 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

diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index da19216bef1a31a9b2a8381b7941d6cee8bd67b3..ab17b0b9cdf1686fe0914cf4494bc9cc4e9f2ea9 100644 (file)
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -2659,8 +2659,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))