Mailman 3 January 2005 - Python-checkins

python/dist/src/PCbuild pythoncore.dsp, 1.48.4.7, 1.48.4.8
by theller＠users.sourceforge.net 25 Jan '05

25 Jan '05

Update of /cvsroot/python/python/dist/src/PCbuild In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14563 Modified Files: Tag: release23-maint pythoncore.dsp Log Message: Build number for 2.3.5c1 is 61. Index: pythoncore.dsp =================================================================== RCS file: /cvsroot/python/python/dist/src/PCbuild/Attic/pythoncore.dsp,v retrieving revision 1.48.4.7 retrieving revision 1.48.4.8 diff -u -d -r1.48.4.7 -r1.48.4.8 --- pythoncore.dsp 25 May 2004 18:43:54 -0000 1.48.4.7 +++ pythoncore.dsp 25 Jan 2005 22:05:22 -0000 1.48.4.8 @@ -258,7 +258,7 @@ # Begin Source File SOURCE=..\Modules\getbuildinfo.c -# ADD CPP /D BUILD=53 +# ADD CPP /D BUILD=61 # End Source File # Begin Source File

1 0

python/dist/src/PC/bdist_wininst install.c, 1.1.14.9, 1.1.14.10
by theller＠users.sourceforge.net 25 Jan '05

25 Jan '05

Update of /cvsroot/python/python/dist/src/PC/bdist_wininst In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27706 Modified Files: Tag: release23-maint install.c Log Message: Running a bdist_wininst installer, built with Python 2.3, installing for Python 2.4 caused a segfault when post_install_script was used. The reason was that the file handle passed to PyRun_SimpleFile() was created with MSVCRT.DLL, but Python 2.4 uses MSVCR71.DLL. So, I replaced PyRun_SimpleFile() with PyRun_SimpleString(). The segfault is gone, but the output of the postinstall script doesn't show up, because still freopen() from MSVCRT is used. (I would be very gratefull if someone proofreads the patch, at least). Index: install.c =================================================================== RCS file: /cvsroot/python/python/dist/src/PC/bdist_wininst/install.c,v retrieving revision 1.1.14.9 retrieving revision 1.1.14.10 diff -u -d -r1.1.14.9 -r1.1.14.10 --- install.c 25 Jan 2005 19:47:48 -0000 1.1.14.9 +++ install.c 25 Jan 2005 20:46:48 -0000 1.1.14.10 @@ -87,6 +87,11 @@ #include <stdarg.h> #include <string.h> #include <time.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <malloc.h> +#include <io.h> +#include <fcntl.h> #include "archive.h" @@ -573,7 +578,7 @@ * 1 if the Python-dll does not export the functions we need * 2 if no install-script is specified in pathname * 3 if the install-script file could not be opened - * the return value of PyRun_SimpleFile() otherwise, + * the return value of PyRun_SimpleString() otherwise, * which is 0 if everything is ok, -1 if an exception had occurred * in the install-script. */ @@ -583,7 +588,7 @@ { DECLPROC(hPython, void, Py_Initialize, (void)); DECLPROC(hPython, int, PySys_SetArgv, (int, char **)); - DECLPROC(hPython, int, PyRun_SimpleFile, (FILE *, char *)); + DECLPROC(hPython, int, PyRun_SimpleString, (char *)); DECLPROC(hPython, void, Py_Finalize, (void)); DECLPROC(hPython, PyObject *, PyImport_ImportModule, (char *)); DECLPROC(hPython, int, PyObject_SetAttrString, @@ -599,10 +604,10 @@ PyObject *mod; int result = 0; - FILE *fp; + int fh; if (!Py_Initialize || !PySys_SetArgv - || !PyRun_SimpleFile || !Py_Finalize) + || !PyRun_SimpleString || !Py_Finalize) return 1; if (!PyImport_ImportModule || !PyObject_SetAttrString @@ -622,13 +627,12 @@ if (pathname == NULL || pathname[0] == '\0') return 2; - fp = fopen(pathname, "r"); - if (!fp) { + fh = open(pathname, _O_RDONLY); + if (-1 == fh) { fprintf(stderr, "Could not open postinstall-script %s\n", pathname); return 3; } - SetDlgItemText(hDialog, IDC_INFO, "Running Script..."); Py_Initialize(); @@ -647,10 +651,22 @@ } PySys_SetArgv(argc, argv); - result = PyRun_SimpleFile(fp, pathname); + result = 3; + { + struct _stat statbuf; + if(0 == _fstat(fh, &statbuf)) { + char *script = alloca(statbuf.st_size + 5); + int n = read(fh, script, statbuf.st_size); + if (n > 0) { + script[n] = '\n'; + script[n+1] = 0; + result = PyRun_SimpleString(script); + } + } + } Py_Finalize(); - fclose(fp); + close(fh); return result; }

1 0

python/dist/src/PC/bdist_wininst install.c, 1.1.14.8, 1.1.14.9
by theller＠users.sourceforge.net 25 Jan '05

25 Jan '05

Update of /cvsroot/python/python/dist/src/PC/bdist_wininst In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13043 Modified Files: Tag: release23-maint install.c Log Message: Set PYTHONHOME before loading Python, so that sys.path will be set correctly. Index: install.c =================================================================== RCS file: /cvsroot/python/python/dist/src/PC/bdist_wininst/install.c,v retrieving revision 1.1.14.8 retrieving revision 1.1.14.9 diff -u -d -r1.1.14.8 -r1.1.14.9 --- install.c 22 Dec 2004 15:46:01 -0000 1.1.14.8 +++ install.c 25 Jan 2005 19:47:48 -0000 1.1.14.9 @@ -1511,8 +1511,14 @@ { char fullpath[_MAX_PATH]; char subkey_name[80]; + char buffer[260 + 12]; LONG size = sizeof(fullpath); - HINSTANCE h = LoadLibrary(fname); + HINSTANCE h; + + /* make sure PYTHONHOME is set, to that sys.path is initialized correctly */ + wsprintf(buffer, "PYTHONHOME=%s", python_dir); + _putenv(buffer); + h = LoadLibrary(fname); if (h) return h; wsprintf(subkey_name,

1 0

python/dist/src/Doc/commontex boilerplate.tex, 1.1.2.9, 1.1.2.10
by fdrake＠users.sourceforge.net 25 Jan '05

25 Jan '05

Update of /cvsroot/python/python/dist/src/Doc/commontex In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10654/commontex Modified Files: Tag: release23-maint boilerplate.tex Log Message: set the release date Index: boilerplate.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/commontex/boilerplate.tex,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -u -d -r1.1.2.9 -r1.1.2.10 --- boilerplate.tex 9 Jun 2004 14:58:21 -0000 1.1.2.9 +++ boilerplate.tex 25 Jan 2005 15:16:49 -0000 1.1.2.10 @@ -5,6 +5,6 @@ Email: \email{docs(a)python.org} } -\date{\today} -%\date{May 20, 2004} % XXX update before final release! +%\date{\today} +\date{January 26, 2005} % XXX update before final release! \input{patchlevel} % include Python version information

1 0

python/dist/src/Lib/idlelib NEWS.txt, 1.23.4.16, 1.23.4.17
by anthonybaxter＠users.sourceforge.net 25 Jan '05

25 Jan '05

Update of /cvsroot/python/python/dist/src/Lib/idlelib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8830/Lib/idlelib Modified Files: Tag: release23-maint NEWS.txt Log Message: 1.0.5, to match the python patchlevel Index: NEWS.txt =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/NEWS.txt,v retrieving revision 1.23.4.16 retrieving revision 1.23.4.17 diff -u -d -r1.23.4.16 -r1.23.4.17 --- NEWS.txt 25 Jan 2005 12:51:42 -0000 1.23.4.16 +++ NEWS.txt 25 Jan 2005 13:08:15 -0000 1.23.4.17 @@ -1,4 +1,4 @@ -What's New in IDLE 1.0.4rc1? +What's New in IDLE 1.0.5rc1? ============================ *Release date: 26-Jan-2005*

1 0

python/dist/src/Lib copy.py,1.42,1.42.8.1
by anthonybaxter＠users.sourceforge.net 25 Jan '05

25 Jan '05

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4976/Lib Modified Files: Tag: release23-maint copy.py Log Message: copy.py fixed to first lookup __copy__ from the instance being copied, rather than only looking at the type - this was broken in 2.3. Index: copy.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/copy.py,v retrieving revision 1.42 retrieving revision 1.42.8.1 diff -u -d -r1.42 -r1.42.8.1 --- copy.py 14 Jun 2003 07:10:06 -0000 1.42 +++ copy.py 25 Jan 2005 12:52:18 -0000 1.42.8.1 @@ -62,6 +62,15 @@ __all__ = ["Error", "copy", "deepcopy"] +def _getspecial(cls, name): + for basecls in cls.__mro__: + try: + return basecls.__dict__[name] + except: + pass + else: + return None + def copy(x): """Shallow copy operation on arbitrary Python objects. @@ -74,7 +83,7 @@ if copier: return copier(x) - copier = getattr(cls, "__copy__", None) + copier = _getspecial(cls, "__copy__") if copier: return copier(x) @@ -90,6 +99,9 @@ if reductor: rv = reductor() else: + copier = getattr(x, "__copy__", None) + if copier: + return copier() raise Error("un(shallow)copyable object of type %s" % cls) return _reconstruct(x, rv, 0) @@ -185,9 +197,9 @@ if issc: y = _deepcopy_atomic(x, memo) else: - copier = getattr(x, "__deepcopy__", None) + copier = _getspecial(cls, "__deepcopy__") if copier: - y = copier(memo) + y = copier(x, memo) else: reductor = dispatch_table.get(cls) if reductor: @@ -201,6 +213,9 @@ if reductor: rv = reductor() else: + copier = getattr(x, "__deepcopy__", None) + if copier: + return copier(memo) raise Error( "un(deep)copyable object of type %s" % cls) y = _reconstruct(x, rv, 1, memo)

1 0

python/dist/src/Lib/test test_copy.py, 1.11, 1.11.8.1
by anthonybaxter＠users.sourceforge.net 25 Jan '05

25 Jan '05

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4976/Lib/test Modified Files: Tag: release23-maint test_copy.py Log Message: copy.py fixed to first lookup __copy__ from the instance being copied, rather than only looking at the type - this was broken in 2.3. Index: test_copy.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_copy.py,v retrieving revision 1.11 retrieving revision 1.11.8.1 diff -u -d -r1.11 -r1.11.8.1 --- test_copy.py 14 Jun 2003 07:10:06 -0000 1.11 +++ test_copy.py 25 Jan 2005 12:52:18 -0000 1.11.8.1 @@ -166,8 +166,64 @@ x = C(42) self.assertEqual(copy.copy(x), x) - # The deepcopy() method + # tests for copying extension types, iff module trycopy is installed + def test_copy_classictype(self): + from _testcapi import make_copyable + x = make_copyable([23]) + y = copy.copy(x) + self.assertEqual(x, y) + self.assertEqual(x.tag, y.tag) + self.assert_(x is not y) + self.assert_(x.tag is y.tag) + + def test_deepcopy_classictype(self): + from _testcapi import make_copyable + x = make_copyable([23]) + y = copy.deepcopy(x) + self.assertEqual(x, y) + self.assertEqual(x.tag, y.tag) + self.assert_(x is not y) + self.assert_(x.tag is not y.tag) + + # regression tests for metaclass-confusion + def test_copy_metaclassconfusion(self): + class MyOwnError(copy.Error): + pass + class Meta(type): + def __copy__(cls): + raise MyOwnError("can't copy classes w/this metaclass") + class C: + __metaclass__ = Meta + def __init__(self, tag): + self.tag = tag + def __cmp__(self, other): + return -cmp(other, self.tag) + # the metaclass can forbid shallow copying of its classes + self.assertRaises(MyOwnError, copy.copy, C) + # check that there is no interference with instances + x = C(23) + self.assertEqual(copy.copy(x), x) + def test_deepcopy_metaclassconfusion(self): + class MyOwnError(copy.Error): + pass + class Meta(type): + def __deepcopy__(cls, memo): + raise MyOwnError("can't deepcopy classes w/this metaclass") + class C: + __metaclass__ = Meta + def __init__(self, tag): + self.tag = tag + def __cmp__(self, other): + return -cmp(other, self.tag) + # types are ALWAYS deepcopied atomically, no matter what + self.assertEqual(copy.deepcopy(C), C) + # check that there is no interference with instances + x = C(23) + self.assertEqual(copy.deepcopy(x), x) + + + # The deepcopy() method def test_deepcopy_basic(self): x = 42 y = copy.deepcopy(x)

1 0

python/dist/src/Modules _testcapimodule.c, 1.24, 1.24.10.1
by anthonybaxter＠users.sourceforge.net 25 Jan '05

25 Jan '05

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4976/Modules Modified Files: Tag: release23-maint _testcapimodule.c Log Message: copy.py fixed to first lookup __copy__ from the instance being copied, rather than only looking at the type - this was broken in 2.3. Index: _testcapimodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/_testcapimodule.c,v retrieving revision 1.24 retrieving revision 1.24.10.1 diff -u -d -r1.24 -r1.24.10.1 --- _testcapimodule.c 24 Apr 2003 16:14:27 -0000 1.24 +++ _testcapimodule.c 25 Jan 2005 12:52:18 -0000 1.24.10.1 @@ -587,6 +587,169 @@ } #endif +/* a classic-type with copyable instances */ + +typedef struct { + PyObject_HEAD + /* instance tag (a string). */ + PyObject* tag; +} CopyableObject; + +staticforward PyTypeObject Copyable_Type; + +#define Copyable_CheckExact(op) ((op)->ob_type == &Copyable_Type) + +/* -------------------------------------------------------------------- */ + +/* copyable constructor and destructor */ +static PyObject* +copyable_new(PyObject* tag) +{ + CopyableObject* self; + + self = PyObject_New(CopyableObject, &Copyable_Type); + if (self == NULL) + return NULL; + Py_INCREF(tag); + self->tag = tag; + return (PyObject*) self; +} + +static PyObject* +copyable(PyObject* self, PyObject* args, PyObject* kw) +{ + PyObject* elem; + PyObject* tag; + if (!PyArg_ParseTuple(args, "O:Copyable", &tag)) + return NULL; + elem = copyable_new(tag); + return elem; +} + +static void +copyable_dealloc(CopyableObject* self) +{ + /* discard attributes */ + Py_DECREF(self->tag); + PyObject_Del(self); +} + +/* copyable methods */ + +static PyObject* +copyable_copy(CopyableObject* self, PyObject* args) +{ + CopyableObject* copyable; + if (!PyArg_ParseTuple(args, ":__copy__")) + return NULL; + copyable = (CopyableObject*)copyable_new(self->tag); + if (!copyable) + return NULL; + return (PyObject*) copyable; +} + +PyObject* _copy_deepcopy; + +static PyObject* +copyable_deepcopy(CopyableObject* self, PyObject* args) +{ + CopyableObject* copyable = 0; + PyObject* memo; + PyObject* tag_copy; + if (!PyArg_ParseTuple(args, "O:__deepcopy__", &memo)) + return NULL; + + tag_copy = PyObject_CallFunctionObjArgs(_copy_deepcopy, self->tag, memo, NULL); + + if(tag_copy) { + copyable = (CopyableObject*)copyable_new(tag_copy); + Py_DECREF(tag_copy); + } + return (PyObject*) copyable; +} + +static PyObject* +copyable_repr(CopyableObject* self) +{ + PyObject* repr; + char buffer[100]; + + repr = PyString_FromString("<Copyable {"); + + PyString_ConcatAndDel(&repr, PyObject_Repr(self->tag)); + + sprintf(buffer, "} at %p>", self); + PyString_ConcatAndDel(&repr, PyString_FromString(buffer)); + + return repr; +} + +static int +copyable_compare(CopyableObject* obj1, CopyableObject* obj2) +{ + return PyObject_Compare(obj1->tag, obj2->tag); +} + +static PyMethodDef copyable_methods[] = { + {"__copy__", (PyCFunction) copyable_copy, METH_VARARGS}, + {"__deepcopy__", (PyCFunction) copyable_deepcopy, METH_VARARGS}, + {NULL, NULL} +}; + +static PyObject* +copyable_getattr(CopyableObject* self, char* name) +{ + PyObject* res; + res = Py_FindMethod(copyable_methods, (PyObject*) self, name); + if (res) + return res; + PyErr_Clear(); + if (strcmp(name, "tag") == 0) { + res = self->tag; + } else { + PyErr_SetString(PyExc_AttributeError, name); + return NULL; + } + if (!res) + return NULL; + Py_INCREF(res); + return res; +} + +static int +copyable_setattr(CopyableObject* self, const char* name, PyObject* value) +{ + if (value == NULL) { + PyErr_SetString( + PyExc_AttributeError, + "can't delete copyable attributes" + ); + return -1; + } + if (strcmp(name, "tag") == 0) { + Py_DECREF(self->tag); + self->tag = value; + Py_INCREF(self->tag); + } else { + PyErr_SetString(PyExc_AttributeError, name); + return -1; + } + return 0; +} + +statichere PyTypeObject Copyable_Type = { + PyObject_HEAD_INIT(NULL) + 0, "Copyable", sizeof(CopyableObject), 0, + /* methods */ + (destructor)copyable_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + (getattrfunc)copyable_getattr, /* tp_getattr */ + (setattrfunc)copyable_setattr, /* tp_setattr */ + (cmpfunc)copyable_compare, /* tp_compare */ + (reprfunc)copyable_repr, /* tp_repr */ + 0, /* tp_as_number */ +}; + static PyMethodDef TestMethods[] = { {"raise_exception", raise_exception, METH_VARARGS}, {"test_config", (PyCFunction)test_config, METH_NOARGS}, @@ -613,9 +776,11 @@ {"test_u_code", (PyCFunction)test_u_code, METH_NOARGS}, #endif #ifdef WITH_THREAD - {"_test_thread_state", (PyCFunction)test_thread_state, METH_VARARGS}, + {"_test_thread_state", (PyCFunction)test_thread_state, METH_VARARGS}, #endif + {"make_copyable", (PyCFunction) copyable, METH_VARARGS}, {NULL, NULL} /* sentinel */ + }; #define AddSym(d, n, f, v) {PyObject *o = f(v); PyDict_SetItemString(d, n, o); Py_DECREF(o);} @@ -624,6 +789,15 @@ init_testcapi(void) { PyObject *m; + PyObject *copy_module; + + + copy_module = PyImport_ImportModule("copy"); + if(!copy_module) + return; + _copy_deepcopy = PyObject_GetAttrString(copy_module, "deepcopy"); + Py_DECREF(copy_module); + Copyable_Type.ob_type = &PyType_Type; m = Py_InitModule("_testcapi", TestMethods);

1 0

python/dist/src/Misc NEWS, 1.831.4.164, 1.831.4.165
by anthonybaxter＠users.sourceforge.net 25 Jan '05

25 Jan '05

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4812/Misc Modified Files: Tag: release23-maint NEWS Log Message: pre-release bits Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.831.4.164 retrieving revision 1.831.4.165 diff -u -d -r1.831.4.164 -r1.831.4.165 --- NEWS 23 Jan 2005 09:50:31 -0000 1.831.4.164 +++ NEWS 25 Jan 2005 12:51:39 -0000 1.831.4.165 @@ -4,10 +4,10 @@ (editors: check NEWS.help for information about editing NEWS using ReST.) -What's New in Python 2.3.5? -=========================== +What's New in Python 2.3.5rc1? +============================== -*Release date: xx-xxx-2005* +*Release date: 26-JAN-2005* Core and builtins ----------------- @@ -76,6 +76,9 @@ Library ------- +- copy.py fixed to first lookup __copy__ from the instance being copied, + rather than only looking at the type - this was broken in 2.3. + - Bug #1103844: fix distutils.install.dump_dirs() with negated options. - Bug #1067732: wininst --install-script doesn't leave residual files anymore.

1 0

python/dist/src/Lib/idlelib NEWS.txt, 1.23.4.15, 1.23.4.16 idlever.py, 1.15.4.6, 1.15.4.7
by anthonybaxter＠users.sourceforge.net 25 Jan '05

25 Jan '05

Update of /cvsroot/python/python/dist/src/Lib/idlelib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4812/Lib/idlelib Modified Files: Tag: release23-maint NEWS.txt idlever.py Log Message: pre-release bits Index: NEWS.txt =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/NEWS.txt,v retrieving revision 1.23.4.15 retrieving revision 1.23.4.16 diff -u -d -r1.23.4.15 -r1.23.4.16 --- NEWS.txt 19 Jan 2005 06:23:51 -0000 1.23.4.15 +++ NEWS.txt 25 Jan 2005 12:51:42 -0000 1.23.4.16 @@ -1,7 +1,7 @@ -What's New in IDLE 1.0.4? -========================= +What's New in IDLE 1.0.4rc1? +============================ -*Release date: XX-Jan-2005* +*Release date: 26-Jan-2005* - On OpenBSD, terminating IDLE with ctrl-c from the command line caused a stuck subprocess MainThread because only the SocketThread was exiting. Index: idlever.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/idlever.py,v retrieving revision 1.15.4.6 retrieving revision 1.15.4.7 diff -u -d -r1.15.4.6 -r1.15.4.7 --- idlever.py 19 Jan 2005 01:44:06 -0000 1.15.4.6 +++ idlever.py 25 Jan 2005 12:51:43 -0000 1.15.4.7 @@ -1 +1 @@ -IDLE_VERSION = "1.0.4" +IDLE_VERSION = "1.0.5c1"

1 0