summaryrefslogtreecommitdiffstats
path: root/Python/import.c
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1993-11-30 13:40:46 (GMT)
committerGuido van Rossum <guido@python.org>1993-11-30 13:40:46 (GMT)
commit590baa4a7a43b596119b47f605e3e570c2b3b0ee (patch)
tree767cbcf90f5b53bf63be9c2ea9a8081551120f10 /Python/import.c
parent8732d6aeea250f23af50b772d710109c9ee3bc00 (diff)
downloadcpython-590baa4a7a43b596119b47f605e3e570c2b3b0ee.zip
cpython-590baa4a7a43b596119b47f605e3e570c2b3b0ee.tar.gz
cpython-590baa4a7a43b596119b47f605e3e570c2b3b0ee.tar.bz2
* import.c (get_module): pass .py filename to parse_file, not .pyc filename!
* funcobject.c (func_repr): don't call getstringvalue(None) for anonymous functions. * bltinmodule.c: removed lambda (which is now a built-in function); removed implied lambda for string arg to filter/map/reduce. * Grammar, graminit.[ch], compile.[ch]: replaced lambda as built-in function by lambda as grammar entity: instead of "lambda('x: x+1')" you write "lambda x: x+1". * Xtmodule.c (checkargdict): return 0, not NULL, for error.
Diffstat (limited to 'Python/import.c')
-rw-r--r--Python/import.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/Python/import.c b/Python/import.c
index 2fc3995..a8cfe5b 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -174,7 +174,8 @@ get_module(m, name, m_ret)
case PY_SOURCE:
mtime = getmtime(namebuf);
- strcat(namebuf, "c");
+ len = strlen(namebuf);
+ strcpy(namebuf + len, "c");
fpc = fopen(namebuf, "rb");
if (fpc != NULL) {
magic = rd_long(fpc);
@@ -204,6 +205,7 @@ get_module(m, name, m_ret)
}
fclose(fpc);
}
+ namebuf[len] = '\0';
err = parse_file(fp, namebuf, file_input, &n);
if (err != E_DONE) {
err_input(err);
@@ -215,9 +217,9 @@ get_module(m, name, m_ret)
return NULL;
if (verbose)
fprintf(stderr,
- "import %s # from %.*s\n",
- name, strlen(namebuf)-1, namebuf);
+ "import %s # from %s\n", name, namebuf);
/* Now write the code object to the ".pyc" file */
+ strcpy(namebuf + len, "c");
fpc = fopen(namebuf, "wb");
if (fpc == NULL) {
if (verbose)