Merged revisions 78322 via svnmerge from

akuchling · akuchling · commit 3fda93e930ff · 2010-02-22T16:59:30.000Z
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
@@ -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
@@ -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))

Original file line number	Diff line number	Diff line change
`@@ -2659,8 +2659,6 @@ PyCurses_Use_Env(PyObject self, PyObject args)`
`2659`	`2659`	`{`
`2660`	`2660`	`int flag;`
`2661`	`2661`
`2662`		`- PyCursesInitialised`
`2663`		`-`
`2664`	`2662`	`switch(PyTuple_Size(args)) {`
`2665`	`2663`	`case 1:`
`2666`	`2664`	`if (!PyArg_ParseTuple(args,"i;True(1), False(0)",&flag))`