mirror of
https://github.com/python/cpython.git
synced 2025-10-17 04:08:28 +00:00
* Added Fixcprt.py: script to fix copyright message.
* various modules: added 1993 to copyright. * thread.c: added copyright notice. * ceval.c: minor change to error message for "+" * stdwinmodule.c: check for error from wfetchcolor * config.c: MS-DOS fixes (define PYTHONPATH, use DELIM, use osdefs.h) * Add declaration of inittab to import.h * sysmodule.c: added sys.builtin_module_names * xxmodule.c, xxobject.c: fix minor errors
This commit is contained in:
parent
35fb82a33f
commit
34679b7661
20 changed files with 122 additions and 51 deletions
|
@ -1,6 +1,6 @@
|
|||
/***********************************************************
|
||||
Copyright 1991, 1992 by Stichting Mathematisch Centrum, Amsterdam, The
|
||||
Netherlands.
|
||||
Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
|
||||
Amsterdam, The Netherlands.
|
||||
|
||||
All Rights Reserved
|
||||
|
||||
|
@ -1577,10 +1577,8 @@ add(v, w)
|
|||
DECREF(w);
|
||||
return x;
|
||||
}
|
||||
else {
|
||||
err_setstr(TypeError, "+ not supported by operands");
|
||||
return NULL;
|
||||
}
|
||||
err_setstr(TypeError, "bad operand type(s) for +");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static object *
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/***********************************************************
|
||||
Copyright 1991, 1992 by Stichting Mathematisch Centrum, Amsterdam, The
|
||||
Netherlands.
|
||||
Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
|
||||
Amsterdam, The Netherlands.
|
||||
|
||||
All Rights Reserved
|
||||
|
||||
|
@ -395,11 +395,6 @@ doneimport()
|
|||
|
||||
/* Initialize built-in modules when first imported */
|
||||
|
||||
extern struct {
|
||||
char *name;
|
||||
void (*initfunc)();
|
||||
} inittab[];
|
||||
|
||||
static int
|
||||
init_builtin(name)
|
||||
char *name;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/***********************************************************
|
||||
Copyright 1991, 1992 by Stichting Mathematisch Centrum, Amsterdam, The
|
||||
Netherlands.
|
||||
Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
|
||||
Amsterdam, The Netherlands.
|
||||
|
||||
All Rights Reserved
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
/***********************************************************
|
||||
Copyright 1991, 1992 by Stichting Mathematisch Centrum, Amsterdam, The
|
||||
Netherlands.
|
||||
Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
|
||||
Amsterdam, The Netherlands.
|
||||
|
||||
All Rights Reserved
|
||||
|
||||
|
@ -154,6 +154,23 @@ static struct methodlist sys_methods[] = {
|
|||
|
||||
static object *sysin, *sysout, *syserr;
|
||||
|
||||
static object *
|
||||
list_builtin_module_names()
|
||||
{
|
||||
object *list = newlistobject(0);
|
||||
int i;
|
||||
if (list == NULL)
|
||||
return NULL;
|
||||
for (i = 0; inittab[i].name != NULL; i++) {
|
||||
object *name = newstringobject(inittab[i].name);
|
||||
if (name == NULL)
|
||||
break;
|
||||
addlistitem(list, name);
|
||||
DECREF(name);
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
void
|
||||
initsys()
|
||||
{
|
||||
|
@ -175,6 +192,8 @@ initsys()
|
|||
dictinsert(sysdict, "stderr", syserr);
|
||||
dictinsert(sysdict, "version", v);
|
||||
dictinsert(sysdict, "modules", get_modules());
|
||||
dictinsert(sysdict, "builtin_module_names",
|
||||
list_builtin_module_names());
|
||||
if (err_occurred())
|
||||
fatal("can't insert sys.* objects in sys dict");
|
||||
DECREF(v);
|
||||
|
|
|
@ -1,3 +1,27 @@
|
|||
/***********************************************************
|
||||
Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
|
||||
Amsterdam, The Netherlands.
|
||||
|
||||
All Rights Reserved
|
||||
|
||||
Permission to use, copy, modify, and distribute this software and its
|
||||
documentation for any purpose and without fee is hereby granted,
|
||||
provided that the above copyright notice appear in all copies and that
|
||||
both that copyright notice and this permission notice appear in
|
||||
supporting documentation, and that the names of Stichting Mathematisch
|
||||
Centrum or CWI not be used in advertising or publicity pertaining to
|
||||
distribution of the software without specific, written prior permission.
|
||||
|
||||
STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
|
||||
THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
|
||||
FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
|
||||
FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
|
||||
OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
******************************************************************/
|
||||
|
||||
#include "thread.h"
|
||||
|
||||
#ifdef DEBUG
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue