summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-11-03 20:31:38 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-11-03 20:31:38 (GMT)
commitc0747cf537ca474307fc1bac8203e296e1c52834 (patch)
treeeac5899612649b42f10ef8e4950e74fd2abc395d /Modules
parent6285ffd9db1eea4591141bd75b8eab3029d3db05 (diff)
downloadcpython-c0747cf537ca474307fc1bac8203e296e1c52834.zip
cpython-c0747cf537ca474307fc1bac8203e296e1c52834.tar.gz
cpython-c0747cf537ca474307fc1bac8203e296e1c52834.tar.bz2
Merged revisions 67028,67040,67044,67046,67052,67065,67070,67077,67082 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r67028 | benjamin.peterson | 2008-10-25 18:27:07 -0500 (Sat, 25 Oct 2008) | 1 line don't use a catch-all ........ r67040 | armin.rigo | 2008-10-28 12:01:21 -0500 (Tue, 28 Oct 2008) | 5 lines Fix one of the tests: it relied on being present in an "output test" in order to actually test what it was supposed to test, i.e. that the code in the __del__ method did not crash. Use instead the new helper test_support.captured_output(). ........ r67044 | amaury.forgeotdarc | 2008-10-29 18:15:57 -0500 (Wed, 29 Oct 2008) | 3 lines Correct error message in io.open(): closefd=True is the only accepted value with a file name. ........ r67046 | thomas.heller | 2008-10-30 15:18:13 -0500 (Thu, 30 Oct 2008) | 2 lines Fixed a modulefinder crash on certain relative imports. ........ r67052 | christian.heimes | 2008-10-30 16:26:15 -0500 (Thu, 30 Oct 2008) | 1 line Issue #4237: io.FileIO() was raising invalid warnings caused by insufficient initialization of PyFileIOObject struct members. ........ r67065 | benjamin.peterson | 2008-10-30 18:59:18 -0500 (Thu, 30 Oct 2008) | 1 line move unprefixed error into .c file ........ r67070 | benjamin.peterson | 2008-10-31 15:41:44 -0500 (Fri, 31 Oct 2008) | 1 line rephrase has_key doc ........ r67077 | benjamin.peterson | 2008-11-03 09:14:51 -0600 (Mon, 03 Nov 2008) | 1 line #4048 make the parser module accept relative imports as valid ........ r67082 | hirokazu.yamamoto | 2008-11-03 12:03:06 -0600 (Mon, 03 Nov 2008) | 2 lines Issue #3774: Fixed an error when create a Tkinter menu item without command and then remove it. Written by Guilherme Polo (gpolo). ........
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_fileio.c2
-rw-r--r--Modules/parsermodule.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/Modules/_fileio.c b/Modules/_fileio.c
index 4b35194..a946ea5 100644
--- a/Modules/_fileio.c
+++ b/Modules/_fileio.c
@@ -251,7 +251,7 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds)
self->closefd = 1;
if (!closefd) {
PyErr_SetString(PyExc_ValueError,
- "Cannot use closefd=True with file name");
+ "Cannot use closefd=False with file name");
goto error;
}
diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c
index 652b07c..58d7dfb 100644
--- a/Modules/parsermodule.c
+++ b/Modules/parsermodule.c
@@ -1710,10 +1710,10 @@ static int
count_from_dots(node *tree)
{
int i;
- for (i = 0; i < NCH(tree); i++)
+ for (i = 1; i < NCH(tree); i++)
if (TYPE(CHILD(tree, i)) != DOT)
break;
- return i;
+ return i-1;
}
/* 'from' ('.'* dotted_name | '.') 'import' ('*' | '(' import_as_names ')' |