From: Andrew M. Kuchling <amk@amk.ca>
Date: Mon, 22 Feb 2010 16:59:30 +0000 (+0000)
Subject: Merged revisions 78322 via svnmerge from
X-Git-Tag: v3.1.2rc1~64
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3fda93e930ff71b5b7a2bd4270f3a69e90164b2a;p=python

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 9f1b145af5..5bd32fb277 100644
--- 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 da19216bef..ab17b0b9cd 100644
--- 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))