From python-checkins at python.org Tue May 1 15:00:26 2007 From: python-checkins at python.org (richard.tew) Date: Tue, 1 May 2007 15:00:26 +0200 (CEST) Subject: [Stackless-checkins] r55047 - in stackless/branches/release25-maint: Doc/commontex/boilerplate.tex Doc/lib/libcurses.tex Include/patchlevel.h Lib/idlelib/NEWS.txt Lib/idlelib/idlever.py Lib/test/test_dict.py Lib/test/test_pep352.py Misc/NEWS Objects/dictobject.c Objects/setobject.c Python/sysmodule.c Stackless/stackless.h Message-ID: <20070501130026.224CA1E4004@bag.python.org> Author: richard.tew Date: Tue May 1 15:00:13 2007 New Revision: 55047 Modified: stackless/branches/release25-maint/Doc/commontex/boilerplate.tex stackless/branches/release25-maint/Doc/lib/libcurses.tex stackless/branches/release25-maint/Include/patchlevel.h stackless/branches/release25-maint/Lib/idlelib/NEWS.txt stackless/branches/release25-maint/Lib/idlelib/idlever.py stackless/branches/release25-maint/Lib/test/test_dict.py stackless/branches/release25-maint/Lib/test/test_pep352.py stackless/branches/release25-maint/Misc/NEWS stackless/branches/release25-maint/Objects/dictobject.c stackless/branches/release25-maint/Objects/setobject.c stackless/branches/release25-maint/Python/sysmodule.c stackless/branches/release25-maint/Stackless/stackless.h Log: Merged in up to r54863 from the python release25-maint branch. Stackless Python 2.5.1 Modified: stackless/branches/release25-maint/Doc/commontex/boilerplate.tex ============================================================================== --- stackless/branches/release25-maint/Doc/commontex/boilerplate.tex (original) +++ stackless/branches/release25-maint/Doc/commontex/boilerplate.tex Tue May 1 15:00:13 2007 @@ -5,5 +5,5 @@ Email: \email{docs at python.org} } -\date{5th April, 2007} % XXX update before final release! +\date{18th April, 2007} % XXX update before final release! \input{patchlevel} % include Python version information Modified: stackless/branches/release25-maint/Doc/lib/libcurses.tex ============================================================================== --- stackless/branches/release25-maint/Doc/lib/libcurses.tex (original) +++ stackless/branches/release25-maint/Doc/lib/libcurses.tex Tue May 1 15:00:13 2007 @@ -1014,9 +1014,11 @@ input at the end of that time. \end{methoddesc} -\begin{methoddesc}[window]{touchline}{start, count} +\begin{methoddesc}[window]{touchline}{start, count\optional{, changed}} Pretend \var{count} lines have been changed, starting with line -\var{start}. +\var{start}. If \var{changed} is supplied, it specifies +whether the affected lines are marked as +having been changed (\var{changed}=1) or unchanged (\var{changed}=0). \end{methoddesc} \begin{methoddesc}[window]{touchwin}{} Modified: stackless/branches/release25-maint/Include/patchlevel.h ============================================================================== --- stackless/branches/release25-maint/Include/patchlevel.h (original) +++ stackless/branches/release25-maint/Include/patchlevel.h Tue May 1 15:00:13 2007 @@ -22,11 +22,11 @@ #define PY_MAJOR_VERSION 2 #define PY_MINOR_VERSION 5 #define PY_MICRO_VERSION 1 -#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA -#define PY_RELEASE_SERIAL 1 +#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL +#define PY_RELEASE_SERIAL 0 /* Version as a string */ -#define PY_VERSION "2.5.1c1" +#define PY_VERSION "2.5.1" /* Subversion Revision number of this file (not of the repository) */ #define PY_PATCHLEVEL_REVISION "$Revision$" Modified: stackless/branches/release25-maint/Lib/idlelib/NEWS.txt ============================================================================== --- stackless/branches/release25-maint/Lib/idlelib/NEWS.txt (original) +++ stackless/branches/release25-maint/Lib/idlelib/NEWS.txt Tue May 1 15:00:13 2007 @@ -1,3 +1,8 @@ +What's New in IDLE 1.2.1? +========================= + +*Release date: 18-APR-2007* + What's New in IDLE 1.2.1c1? =========================== Modified: stackless/branches/release25-maint/Lib/idlelib/idlever.py ============================================================================== --- stackless/branches/release25-maint/Lib/idlelib/idlever.py (original) +++ stackless/branches/release25-maint/Lib/idlelib/idlever.py Tue May 1 15:00:13 2007 @@ -1 +1 @@ -IDLE_VERSION = "1.2.1c1" +IDLE_VERSION = "1.2.1" Modified: stackless/branches/release25-maint/Lib/test/test_dict.py ============================================================================== --- stackless/branches/release25-maint/Lib/test/test_dict.py (original) +++ stackless/branches/release25-maint/Lib/test/test_dict.py Tue May 1 15:00:13 2007 @@ -189,14 +189,6 @@ self.assertRaises(ValueError, {}.update, [(1, 2, 3)]) - # SF #1615701: make d.update(m) honor __getitem__() and keys() in dict subclasses - class KeyUpperDict(dict): - def __getitem__(self, key): - return key.upper() - d.clear() - d.update(KeyUpperDict.fromkeys('abc')) - self.assertEqual(d, {'a':'A', 'b':'B', 'c':'C'}) - def test_fromkeys(self): self.assertEqual(dict.fromkeys('abc'), {'a':None, 'b':None, 'c':None}) d = {} Modified: stackless/branches/release25-maint/Lib/test/test_pep352.py ============================================================================== --- stackless/branches/release25-maint/Lib/test/test_pep352.py (original) +++ stackless/branches/release25-maint/Lib/test/test_pep352.py Tue May 1 15:00:13 2007 @@ -19,6 +19,13 @@ self.failUnless(hasattr(ins, attr), "%s missing %s attribute" % (ins.__class__.__name__, attr)) + def stackless_enabled(self): + try: + import stackless + return True + except: + return False + def test_inheritance(self): # Make sure the inheritance hierarchy matches the documentation exc_set = set(x for x in dir(exceptions) if not x.startswith('_')) @@ -51,7 +58,9 @@ try: exc = getattr(__builtin__, exc_name) except AttributeError: - self.fail("%s not a built-in exception" % exc_name) + # This exception is only compiled into Stackless. + if self.stackless_enabled() or exc_name != "TaskletExit": + self.fail("%s not a built-in exception" % exc_name) if last_depth < depth: superclasses.append((last_depth, last_exc)) elif last_depth > depth: @@ -64,7 +73,9 @@ self.verify_instance_interface(exc()) except TypeError: pass - self.failUnless(exc_name in exc_set) + # This exception is only compiled into Stackless. + if self.stackless_enabled() or exc_name != "TaskletExit": + self.failUnless(exc_name in exc_set) exc_set.discard(exc_name) last_exc = exc last_depth = depth Modified: stackless/branches/release25-maint/Misc/NEWS ============================================================================== --- stackless/branches/release25-maint/Misc/NEWS (original) +++ stackless/branches/release25-maint/Misc/NEWS Tue May 1 15:00:13 2007 @@ -4,6 +4,19 @@ (editors: check NEWS.help for information about editing NEWS using ReST.) +What's New in Python 2.5.1? +============================= + +*Release date: 18-APR-2007* + +Core and builtins +----------------- + +- Revert SF #1615701: dict.update() does *not* call __getitem__() or keys() + if subclassed. This is to remain consistent with 2.5. + Also revert revision 53667 with made a similar change to set.update(). + + What's New in Python 2.5.1c1? ============================= Modified: stackless/branches/release25-maint/Objects/dictobject.c ============================================================================== --- stackless/branches/release25-maint/Objects/dictobject.c (original) +++ stackless/branches/release25-maint/Objects/dictobject.c Tue May 1 15:00:13 2007 @@ -1352,7 +1352,7 @@ return -1; } mp = (dictobject*)a; - if (PyDict_CheckExact(b)) { + if (PyDict_Check(b)) { other = (dictobject*)b; if (other == mp || other->ma_used == 0) /* a.update(a) or a.update({}); nothing to do */ Modified: stackless/branches/release25-maint/Objects/setobject.c ============================================================================== --- stackless/branches/release25-maint/Objects/setobject.c (original) +++ stackless/branches/release25-maint/Objects/setobject.c Tue May 1 15:00:13 2007 @@ -916,7 +916,7 @@ { PyObject *key, *it; - if (PyAnySet_CheckExact(other)) + if (PyAnySet_Check(other)) return set_merge(so, other); if (PyDict_CheckExact(other)) { @@ -1211,7 +1211,7 @@ if (result == NULL) return NULL; - if (PyAnySet_CheckExact(other)) { + if (PyAnySet_Check(other)) { Py_ssize_t pos = 0; setentry *entry; @@ -1335,7 +1335,7 @@ if ((PyObject *)so == other) return set_clear_internal(so); - if (PyAnySet_CheckExact(other)) { + if (PyAnySet_Check(other)) { setentry *entry; Py_ssize_t pos = 0; @@ -1384,7 +1384,7 @@ setentry *entry; Py_ssize_t pos = 0; - if (!PyAnySet_CheckExact(other) && !PyDict_CheckExact(other)) { + if (!PyAnySet_Check(other) && !PyDict_CheckExact(other)) { result = set_copy(so); if (result == NULL) return NULL; @@ -1491,7 +1491,7 @@ Py_RETURN_NONE; } - if (PyAnySet_CheckExact(other)) { + if (PyAnySet_Check(other)) { Py_INCREF(other); otherset = (PySetObject *)other; } else { @@ -1574,7 +1574,7 @@ setentry *entry; Py_ssize_t pos = 0; - if (!PyAnySet_CheckExact(other)) { + if (!PyAnySet_Check(other)) { PyObject *tmp, *result; tmp = make_new_set(&PySet_Type, other); if (tmp == NULL) @@ -1603,7 +1603,7 @@ { PyObject *tmp, *result; - if (!PyAnySet_CheckExact(other)) { + if (!PyAnySet_Check(other)) { tmp = make_new_set(&PySet_Type, other); if (tmp == NULL) return NULL; Modified: stackless/branches/release25-maint/Python/sysmodule.c ============================================================================== --- stackless/branches/release25-maint/Python/sysmodule.c (original) +++ stackless/branches/release25-maint/Python/sysmodule.c Tue May 1 15:00:13 2007 @@ -1005,8 +1005,6 @@ } else if (istag || strncmp(br_start, "branches", 8) == 0) { len = br_end2 - br_start; - assert(len >= 13); - assert(len < (sizeof(patchlevel_revision) - 13)); strncpy(branch, br_start, len); branch[len] = '\0'; Modified: stackless/branches/release25-maint/Stackless/stackless.h ============================================================================== --- stackless/branches/release25-maint/Stackless/stackless.h (original) +++ stackless/branches/release25-maint/Stackless/stackless.h Tue May 1 15:00:13 2007 @@ -34,7 +34,7 @@ * ...and then write your support code and mention it in the * common slp_platformselect.h file. */ -#define STACKLESS +#define STACKLESS_OFF #ifdef STACKLESS_OFF #undef STACKLESS _______________________________________________ Stackless-checkins mailing list Stackless-checkins at stackless.com http://www.stackless.com/mailman/listinfo/stackless-checkins From python-checkins at python.org Tue May 15 11:59:13 2007 From: python-checkins at python.org (richard.tew) Date: Tue, 15 May 2007 11:59:13 +0200 (CEST) Subject: [Stackless-checkins] r55338 - stackless/branches/release25-maint/Stackless/platf/switch_amd64_unix_gas.s Message-ID: <20070515095913.17C281E4002@bag.python.org> Author: richard.tew Date: Tue May 15 11:59:10 2007 New Revision: 55338 Added: stackless/branches/release25-maint/Stackless/platf/switch_amd64_unix_gas.s Log: Most of the work towards assembler based hard switching code for gcc based AMD64 code. Last I checked it still caused crashes, requires further work and is not hooked into the build process. Added: stackless/branches/release25-maint/Stackless/platf/switch_amd64_unix_gas.s ============================================================================== --- (empty file) +++ stackless/branches/release25-maint/Stackless/platf/switch_amd64_unix_gas.s Tue May 15 11:59:10 2007 @@ -0,0 +1,56 @@ +# NOTE: This is not yet safe to use. Checked in for the same of reference. +# +# (int) slp_switch (void); + + .text + .type slp_switch, @function + # This next line is required to the C code can find and + # link against this function. + .global slp_switch +slp_switch: + pushq %rbp + pushq %r15 + pushq %r14 + pushq %r13 + pushq %r12 + pushq %rbx + + # Disabled for now, which should ideally give us identical + # behaviour to the inline C version. Can add this when we + # are ready for it. + #subq $8, %rsp + #stmxcsr (%rsp) + + movq %rsp, %rdi + + call slp_save_state # diff = slp_save_state([?]stackref) + + cmp $-1, %eax # if (diff == -1) + je .exit # return -1; + + cmp $1, %eax # if (diff == 1) + je .no_restore # return 0; + +.restore: + add %eax, %esp # Adjust the stack pointer for the state we are restoring. + + call slp_restore_state # slp_restore_state() + +.no_restore: + xor %rax, %rax # Switch successful (whether we restored or not). + +.exit: + #ldmxcsr (%rsp) + #addq $8, %rsp + + popq %rbx + popq %r12 + popq %r13 + popq %r14 + popq %r15 + # rbp gets popped by the leave statement + + leave + ret +.LFE11: + .size slp_switch, .-slp_switch _______________________________________________ Stackless-checkins mailing list Stackless-checkins at stackless.com http://www.stackless.com/mailman/listinfo/stackless-checkins From python-checkins at python.org Sun May 6 22:41:40 2007 From: python-checkins at python.org (richard.tew) Date: Sun, 6 May 2007 22:41:40 +0200 (CEST) Subject: [Stackless-checkins] r55159 - stackless/branches/release25-maint/Stackless/unittests/test_pickle.py Message-ID: <20070506204140.9A3F31E4002@bag.python.org> Author: richard.tew Date: Sun May 6 22:41:35 2007 New Revision: 55159 Modified: stackless/branches/release25-maint/Stackless/unittests/test_pickle.py Log: Add a test to ensure that pickling a tasklet in the middle of a call to channelInstance.send_sequence works. Modified: stackless/branches/release25-maint/Stackless/unittests/test_pickle.py ============================================================================== --- stackless/branches/release25-maint/Stackless/unittests/test_pickle.py (original) +++ stackless/branches/release25-maint/Stackless/unittests/test_pickle.py Sun May 6 22:41:35 2007 @@ -264,6 +264,32 @@ # Force the collection of the unpickled tasklet. gc.collect() + def testSendSequence(self): + # Send sequence when pickled was not handled. It uses + # a custom cframe execute function which was not recognised + # by the pickling. + # + # Traceback (most recent call last): + # File ".\test_pickle.py", line 283, in testSendSequence + # pickle.dumps(t1) + # ValueError: frame exec function at 1e00bf40 is not registered! + + def sender(chan): + l = [ 1, 2, 3, 4 ] + chan.send_sequence(l) + + def receiver(chan): + length = 4 + while length: + v = chan.receive() + length -= 1 + + c = stackless.channel() + t1 = stackless.tasklet(sender)(c) + t2 = stackless.tasklet(receiver)(c) + t1.run() + + pickle.dumps(t1) if __name__ == '__main__': if not sys.argv[1:]: _______________________________________________ Stackless-checkins mailing list Stackless-checkins at stackless.com http://www.stackless.com/mailman/listinfo/stackless-checkins From python-checkins at python.org Mon May 14 16:24:56 2007 From: python-checkins at python.org (kristjan.jonsson) Date: Mon, 14 May 2007 16:24:56 +0200 (CEST) Subject: [Stackless-checkins] r55311 - stackless/branches/release25-maint/Stackless/core/slp_transfer.c Message-ID: <20070514142456.26D2A1E4009@bag.python.org> Author: kristjan.jonsson Date: Mon May 14 16:24:51 2007 New Revision: 55311 Modified: stackless/branches/release25-maint/Stackless/core/slp_transfer.c Log: Fix a serious bug on 64 bit windows. slp_save_state was using an int to compute stack differences. When this function was called from assembler, it was not automatically sign extended to 64 bits, and therefore, negative results got interpreted as large positive ones. Now the testsuite runs perfectly on XP64 Modified: stackless/branches/release25-maint/Stackless/core/slp_transfer.c ============================================================================== --- stackless/branches/release25-maint/Stackless/core/slp_transfer.c (original) +++ stackless/branches/release25-maint/Stackless/core/slp_transfer.c Mon May 14 16:24:51 2007 @@ -62,15 +62,9 @@ #undef __return #define __return(x) { exitcode = x; goto exit; } -int slp_save_state(intptr_t *stack){ - int exitcode; -#ifdef SSIZE_T - /* Only on Windows apparently. */ - SSIZE_T diff; -#else - /* Py_ssize_t when we port to 2.5? */ - int diff; -#endif +intptr_t slp_save_state(intptr_t *stack){ + intptr_t exitcode; + intptr_t diff; SLP_SAVE_STATE(stack, diff); return diff; exit: _______________________________________________ Stackless-checkins mailing list Stackless-checkins at stackless.com http://www.stackless.com/mailman/listinfo/stackless-checkins From python-checkins at python.org Tue May 1 12:25:52 2007 From: python-checkins at python.org (richard.tew) Date: Tue, 1 May 2007 12:25:52 +0200 (CEST) Subject: [Stackless-checkins] r55043 - in stackless/branches/release25-maint/Stackless: module/channelobject.c module/channelobject.h pickling/prickelpit.c Message-ID: <20070501102552.7EBD01E4004@bag.python.org> Author: richard.tew Date: Tue May 1 12:25:50 2007 New Revision: 55043 Modified: stackless/branches/release25-maint/Stackless/module/channelobject.c stackless/branches/release25-maint/Stackless/module/channelobject.h stackless/branches/release25-maint/Stackless/pickling/prickelpit.c Log: Allow the channel send sequence method to be pickled. This involved hooking the frame pickling used for the eval_frame functions up to be used for the cframe used by channel_send_sequence. Was a little unsure about this change, but Christian gave it an ok when I passed it by him. Modified: stackless/branches/release25-maint/Stackless/module/channelobject.c ============================================================================== --- stackless/branches/release25-maint/Stackless/module/channelobject.c (original) +++ stackless/branches/release25-maint/Stackless/module/channelobject.c Tue May 1 12:25:50 2007 @@ -745,7 +745,7 @@ * the loop all the time. Hopefully the idea is still visible. */ -static PyObject * +PyObject * channel_seq_callback(PyFrameObject *_f, int exc, PyObject *retval) { PyThreadState *ts; Modified: stackless/branches/release25-maint/Stackless/module/channelobject.h ============================================================================== --- stackless/branches/release25-maint/Stackless/module/channelobject.h (original) +++ stackless/branches/release25-maint/Stackless/module/channelobject.h Tue May 1 12:25:50 2007 @@ -17,3 +17,6 @@ } PyChannel_HeapType; int init_channeltype(void); + +PyObject * channel_seq_callback(struct _frame *f, int throwflag, + PyObject *retval); Modified: stackless/branches/release25-maint/Stackless/pickling/prickelpit.c ============================================================================== --- stackless/branches/release25-maint/Stackless/pickling/prickelpit.c (original) +++ stackless/branches/release25-maint/Stackless/pickling/prickelpit.c Tue May 1 12:25:50 2007 @@ -5,6 +5,7 @@ #include "core/stackless_impl.h" #include "pickling/prickelpit.h" +#include "module/channelobject.h" /* platform specific constants */ #include "platf/slp_platformselect.h" @@ -719,6 +720,7 @@ DEF_INVALID_EXEC(eval_frame_value) DEF_INVALID_EXEC(eval_frame_noval) DEF_INVALID_EXEC(eval_frame_iter) +DEF_INVALID_EXEC(channel_seq_callback) static PyTypeObject wrap_PyFrame_Type; @@ -1048,6 +1050,8 @@ PyEval_EvalFrame_noval, REF_INVALID_EXEC(eval_frame_noval)) || slp_register_execute(&PyFrame_Type, "eval_frame_iter", PyEval_EvalFrame_iter, REF_INVALID_EXEC(eval_frame_iter)) + || slp_register_execute(&PyCFrame_Type, "channel_seq_callback", + channel_seq_callback, REF_INVALID_EXEC(channel_seq_callback)) || init_type(&wrap_PyFrame_Type, initchain); } #undef initchain _______________________________________________ Stackless-checkins mailing list Stackless-checkins at stackless.com http://www.stackless.com/mailman/listinfo/stackless-checkins From python-checkins at python.org Mon May 14 17:59:14 2007 From: python-checkins at python.org (kristjan.jonsson) Date: Mon, 14 May 2007 17:59:14 +0200 (CEST) Subject: [Stackless-checkins] r55314 - in stackless/branches/release25-maint/Stackless: module/channelobject.c stackless_api.h Message-ID: <20070514155914.558401E4009@bag.python.org> Author: kristjan.jonsson Date: Mon May 14 17:59:12 2007 New Revision: 55314 Modified: stackless/branches/release25-maint/Stackless/module/channelobject.c stackless/branches/release25-maint/Stackless/stackless_api.h Log: Add a new api: PyChannel_GetBalance(). Modified: stackless/branches/release25-maint/Stackless/module/channelobject.c ============================================================================== --- stackless/branches/release25-maint/Stackless/module/channelobject.c (original) +++ stackless/branches/release25-maint/Stackless/module/channelobject.c Mon May 14 17:59:12 2007 @@ -244,6 +244,12 @@ self->flags.schedule_all = val ? 1 : 0; } +int +PyChannel_GetBalance(PyChannelObject *self) +{ + return self->balance; +} + static PyGetSetDef channel_getsetlist[] = { {"queue", (getter)channel_get_queue, NULL, "the chain of waiting tasklets."}, Modified: stackless/branches/release25-maint/Stackless/stackless_api.h ============================================================================== --- stackless/branches/release25-maint/Stackless/stackless_api.h (original) +++ stackless/branches/release25-maint/Stackless/stackless_api.h Mon May 14 17:59:12 2007 @@ -261,6 +261,12 @@ PyAPI_FUNC(int) PyChannel_GetScheduleAll(PyChannelObject *self); PyAPI_FUNC(void) PyChannel_SetScheduleAll(PyChannelObject *self, int val); +/* + *Get the current channel balance. Negative numbers are readers, positive + * are writers + */ +PyAPI_FUNC(int) PyChannel_GetBalance(PyChannelObject *self); + /****************************************************** stacklessmodule functions _______________________________________________ Stackless-checkins mailing list Stackless-checkins at stackless.com http://www.stackless.com/mailman/listinfo/stackless-checkins From python-checkins at python.org Sun May 6 17:36:22 2007 From: python-checkins at python.org (kristjan.jonsson) Date: Sun, 6 May 2007 17:36:22 +0200 (CEST) Subject: [Stackless-checkins] r55157 - stackless/branches/release25-maint/PCbuild8/pyproject.vsprops Message-ID: <20070506153622.BC4B31E4002@bag.python.org> Author: kristjan.jonsson Date: Sun May 6 17:36:22 2007 New Revision: 55157 Modified: stackless/branches/release25-maint/PCbuild8/pyproject.vsprops Log: Update the pyproject.vsprops property sheet with the stackless include dir Modified: stackless/branches/release25-maint/PCbuild8/pyproject.vsprops ============================================================================== --- stackless/branches/release25-maint/PCbuild8/pyproject.vsprops (original) +++ stackless/branches/release25-maint/PCbuild8/pyproject.vsprops Sun May 6 17:36:22 2007 @@ -8,7 +8,7 @@ > Author: richard.tew Date: Sun May 6 22:52:54 2007 New Revision: 55161 Added: stackless/trunk/Stackless/unittests/test_exception.py - copied unchanged from r55160, stackless/branches/release25-maint/Stackless/unittests/test_exception.py Modified: stackless/trunk/Stackless/unittests/test_pickle.py Log: Ported Stackless release25-maint r55159, r55160. Added a test for the crasher where TaskletExit was incorrectly defined as to its exception type. It was fixed recently by Kristjan, but a test can't hurt. Modified: stackless/trunk/Stackless/unittests/test_pickle.py ============================================================================== --- stackless/trunk/Stackless/unittests/test_pickle.py (original) +++ stackless/trunk/Stackless/unittests/test_pickle.py Sun May 6 22:52:54 2007 @@ -264,6 +264,32 @@ # Force the collection of the unpickled tasklet. gc.collect() + def testSendSequence(self): + # Send sequence when pickled was not handled. It uses + # a custom cframe execute function which was not recognised + # by the pickling. + # + # Traceback (most recent call last): + # File ".\test_pickle.py", line 283, in testSendSequence + # pickle.dumps(t1) + # ValueError: frame exec function at 1e00bf40 is not registered! + + def sender(chan): + l = [ 1, 2, 3, 4 ] + chan.send_sequence(l) + + def receiver(chan): + length = 4 + while length: + v = chan.receive() + length -= 1 + + c = stackless.channel() + t1 = stackless.tasklet(sender)(c) + t2 = stackless.tasklet(receiver)(c) + t1.run() + + pickle.dumps(t1) if __name__ == '__main__': if not sys.argv[1:]: _______________________________________________ Stackless-checkins mailing list Stackless-checkins at stackless.com http://www.stackless.com/mailman/listinfo/stackless-checkins From stackless-checkins at stackless.com Mon May 21 20:28:44 2007 From: stackless-checkins at stackless.com (Business News) Date: Mon, 21 May 2007 20:28:44 +0200 Subject: [Stackless-checkins] All Investors Alert ! Message-ID: <20070521-52538.3133.qmail@dsl-189-152-40-115.prod-infinitum.com.mx> An HTML attachment was scrubbed... URL: http://www.stackless.com/pipermail/stackless-checkins/attachments/20070521/bdda827f/attachment.htm -------------- next part -------------- _______________________________________________ Stackless-checkins mailing list Stackless-checkins at stackless.com http://www.stackless.com/mailman/listinfo/stackless-checkins From python-checkins at python.org Mon May 14 16:29:10 2007 From: python-checkins at python.org (kristjan.jonsson) Date: Mon, 14 May 2007 16:29:10 +0200 (CEST) Subject: [Stackless-checkins] r55312 - stackless/branches/release25-maint/Stackless/core/slp_transfer.c Message-ID: <20070514142910.3ADE41E4009@bag.python.org> Author: kristjan.jonsson Date: Mon May 14 16:29:07 2007 New Revision: 55312 Modified: stackless/branches/release25-maint/Stackless/core/slp_transfer.c Log: Fix indentation Modified: stackless/branches/release25-maint/Stackless/core/slp_transfer.c ============================================================================== --- stackless/branches/release25-maint/Stackless/core/slp_transfer.c (original) +++ stackless/branches/release25-maint/Stackless/core/slp_transfer.c Mon May 14 16:29:07 2007 @@ -25,16 +25,16 @@ #define __return(x) return (x) #define SLP_SAVE_STATE(stackref, stsizediff) \ - intptr_t stsizeb; \ + intptr_t stsizeb; \ stackref += STACK_MAGIC; \ if (_cstprev != NULL) { \ - if (slp_cstack_new(_cstprev, (intptr_t *)stackref, _prev) == NULL) __return(-1); \ + if (slp_cstack_new(_cstprev, (intptr_t *)stackref, _prev) == NULL) __return(-1); \ stsizeb = slp_cstack_save(*_cstprev); \ } \ else \ - stsizeb = (_cst->startaddr - (intptr_t *)stackref) * sizeof(intptr_t); \ - if (_cst == NULL) __return(0); \ - stsizediff = stsizeb - (_cst->ob_size * sizeof(intptr_t)); + stsizeb = (_cst->startaddr - (intptr_t *)stackref) * sizeof(intptr_t); \ + if (_cst == NULL) __return(0); \ + stsizediff = stsizeb - (_cst->ob_size * sizeof(intptr_t)); #define SLP_RESTORE_STATE() \ if (_cst != NULL) { \ @@ -91,12 +91,12 @@ * needed stack size becomes *negative* :-)) */ PyThreadState *ts = PyThreadState_GET(); - intptr_t probe; - ptrdiff_t needed = &probe - ts->st.cstack_base; + intptr_t probe; + ptrdiff_t needed = &probe - ts->st.cstack_base; /* in rare cases, the need might have vanished due to the recursion */ - intptr_t *goobledigoobs; + intptr_t *goobledigoobs; if (needed > 0) { - goobledigoobs = alloca(needed * sizeof(intptr_t)); + goobledigoobs = alloca(needed * sizeof(intptr_t)); if (goobledigoobs == NULL) return -1; } @@ -112,7 +112,7 @@ /* since we change the stack we must assure that the protocol was met */ STACKLESS_ASSERT(); - if ((intptr_t *) &ts > ts->st.cstack_base) + if ((intptr_t *) &ts > ts->st.cstack_base) return climb_stack_and_transfer(cstprev, cst, prev); if (cst == NULL || cst->ob_size == 0) cst = ts->st.initial_stub; _______________________________________________ Stackless-checkins mailing list Stackless-checkins at stackless.com http://www.stackless.com/mailman/listinfo/stackless-checkins From python-checkins at python.org Sun May 6 22:47:43 2007 From: python-checkins at python.org (richard.tew) Date: Sun, 6 May 2007 22:47:43 +0200 (CEST) Subject: [Stackless-checkins] r55160 - stackless/branches/release25-maint/Stackless/unittests/test_exception.py Message-ID: <20070506204743.41B811E4002@bag.python.org> Author: richard.tew Date: Sun May 6 22:47:40 2007 New Revision: 55160 Added: stackless/branches/release25-maint/Stackless/unittests/test_exception.py Log: Added a test for the crasher where TaskletExit was incorrectly defined as to its exception type. It was fixed recently by Kristjan, but a test can't hurt. Added: stackless/branches/release25-maint/Stackless/unittests/test_exception.py ============================================================================== --- (empty file) +++ stackless/branches/release25-maint/Stackless/unittests/test_exception.py Sun May 6 22:47:40 2007 @@ -0,0 +1,10 @@ +import unittest + + +class TestException(unittest.TestCase): + def testTaskletExitCode(self): + # Tasklet exit was defined as the wrong kind of exception. + # When its code attribute was accessed the runtime would + # crash. This has been fixed. + exc = TaskletExit() + exc.code _______________________________________________ Stackless-checkins mailing list Stackless-checkins at stackless.com http://www.stackless.com/mailman/listinfo/stackless-checkins From python-checkins at python.org Sat May 5 11:55:38 2007 From: python-checkins at python.org (kristjan.jonsson) Date: Sat, 5 May 2007 11:55:38 +0200 (CEST) Subject: [Stackless-checkins] r55145 - in stackless/branches/release25-maint: Modules/datetimemodule.c Modules/getbuildinfo.c PC/make_versioninfo.c PCbuild8/PGInstrument.vsprops PCbuild8/PGUpdate.vsprops PCbuild8/Uninstal.wse PCbuild8/_bsddb PCbuild8/_bsddb.vcproj PCbuild8/_ctypes PCbuild8/_ctypes.vcproj PCbuild8/_ctypes_test PCbuild8/_ctypes_test.vcproj PCbuild8/_elementtree PCbuild8/_elementtree.vcproj PCbuild8/_msi PCbuild8/_msi.vcproj PCbuild8/_socket PCbuild8/_socket.vcproj PCbuild8/_sqlite3 PCbuild8/_sqlite3.vcproj PCbuild8/_ssl.mak PCbuild8/_ssl.vcproj PCbuild8/_testcapi PCbuild8/_testcapi.vcproj PCbuild8/_tkinter PCbuild8/_tkinter.vcproj PCbuild8/build.bat PCbuild8/build_pgo.bat PCbuild8/build_ssl.py PCbuild8/bz2 PCbuild8/bz2.vcproj PCbuild8/db.build PCbuild8/field3.py PCbuild8/make_buildinfo PCbuild8/make_buildinfo.c PCbuild8/make_buildinfo.vcproj PCbuild8/make_versioninfo PCbuild8/make_versioninfo.vcproj PCbuild8/pcbuild.sln PCbuild8/pyd.vsprops PCbuild8/pyd_d.vsprops PCbuild8/pyexpat ! PCbuild8/pyexpat.vcproj PCbuild8/pyproject.vsprops PCbuild8/python PCbuild8/python.build PCbuild8/python.iss PCbuild8/python.vcproj PCbuild8/python20.wse PCbuild8/pythoncore PCbuild8/pythoncore.vcproj PCbuild8/pythoncore/pythoncore.vcproj PCbuild8/pythonw PCbuild8/pythonw.vcproj PCbuild8/readme.txt PCbuild8/rmpyc.py PCbuild8/rt.bat PCbuild8/select PCbuild8/select.vcproj PCbuild8/unicodedata PCbuild8/unicodedata.vcproj PCbuild8/w9xpopen PCbuild8/w9xpopen.vcproj PCbuild8/winsound PCbuild8/winsound.vcproj Python/import.c Python/pythonrun.c Message-ID: <20070505095538.251E51E4002@bag.python.org> Author: kristjan.jonsson Date: Sat May 5 11:55:26 2007 New Revision: 55145 Added: stackless/branches/release25-maint/PCbuild8/PGInstrument.vsprops - copied unchanged from r55144, python/branches/release25-maint/PCbuild8/PGInstrument.vsprops stackless/branches/release25-maint/PCbuild8/PGUpdate.vsprops - copied unchanged from r55144, python/branches/release25-maint/PCbuild8/PGUpdate.vsprops stackless/branches/release25-maint/PCbuild8/_bsddb/ - copied from r55144, python/branches/release25-maint/PCbuild8/_bsddb/ stackless/branches/release25-maint/PCbuild8/_ctypes/ - copied from r55144, python/branches/release25-maint/PCbuild8/_ctypes/ stackless/branches/release25-maint/PCbuild8/_ctypes_test/ - copied from r55144, python/branches/release25-maint/PCbuild8/_ctypes_test/ stackless/branches/release25-maint/PCbuild8/_elementtree/ - copied from r55144, python/branches/release25-maint/PCbuild8/_elementtree/ stackless/branches/release25-maint/PCbuild8/_msi/ - copied from r55144, python/branches/release25-maint/PCbuild8/_msi/ stackless/branches/release25-maint/PCbuild8/_socket/ - copied from r55144, python/branches/release25-maint/PCbuild8/_socket/ stackless/branches/release25-maint/PCbuild8/_sqlite3/ - copied from r55144, python/branches/release25-maint/PCbuild8/_sqlite3/ stackless/branches/release25-maint/PCbuild8/_testcapi/ - copied from r55144, python/branches/release25-maint/PCbuild8/_testcapi/ stackless/branches/release25-maint/PCbuild8/_tkinter/ - copied from r55144, python/branches/release25-maint/PCbuild8/_tkinter/ stackless/branches/release25-maint/PCbuild8/build.bat - copied unchanged from r55144, python/branches/release25-maint/PCbuild8/build.bat stackless/branches/release25-maint/PCbuild8/build_pgo.bat - copied unchanged from r55144, python/branches/release25-maint/PCbuild8/build_pgo.bat stackless/branches/release25-maint/PCbuild8/bz2/ - copied from r55144, python/branches/release25-maint/PCbuild8/bz2/ stackless/branches/release25-maint/PCbuild8/make_buildinfo/ - copied from r55144, python/branches/release25-maint/PCbuild8/make_buildinfo/ stackless/branches/release25-maint/PCbuild8/make_versioninfo/ - copied from r55144, python/branches/release25-maint/PCbuild8/make_versioninfo/ stackless/branches/release25-maint/PCbuild8/pyd.vsprops - copied unchanged from r55144, python/branches/release25-maint/PCbuild8/pyd.vsprops stackless/branches/release25-maint/PCbuild8/pyd_d.vsprops - copied unchanged from r55144, python/branches/release25-maint/PCbuild8/pyd_d.vsprops stackless/branches/release25-maint/PCbuild8/pyexpat/ - copied from r55144, python/branches/release25-maint/PCbuild8/pyexpat/ stackless/branches/release25-maint/PCbuild8/pyproject.vsprops - copied unchanged from r55144, python/branches/release25-maint/PCbuild8/pyproject.vsprops stackless/branches/release25-maint/PCbuild8/python/ - copied from r55144, python/branches/release25-maint/PCbuild8/python/ stackless/branches/release25-maint/PCbuild8/pythoncore/ - copied from r55144, python/branches/release25-maint/PCbuild8/pythoncore/ stackless/branches/release25-maint/PCbuild8/pythonw/ - copied from r55144, python/branches/release25-maint/PCbuild8/pythonw/ stackless/branches/release25-maint/PCbuild8/select/ - copied from r55144, python/branches/release25-maint/PCbuild8/select/ stackless/branches/release25-maint/PCbuild8/unicodedata/ - copied from r55144, python/branches/release25-maint/PCbuild8/unicodedata/ stackless/branches/release25-maint/PCbuild8/w9xpopen/ - copied from r55144, python/branches/release25-maint/PCbuild8/w9xpopen/ stackless/branches/release25-maint/PCbuild8/winsound/ - copied from r55144, python/branches/release25-maint/PCbuild8/winsound/ Removed: stackless/branches/release25-maint/PCbuild8/Uninstal.wse stackless/branches/release25-maint/PCbuild8/_bsddb.vcproj stackless/branches/release25-maint/PCbuild8/_ctypes.vcproj stackless/branches/release25-maint/PCbuild8/_ctypes_test.vcproj stackless/branches/release25-maint/PCbuild8/_elementtree.vcproj stackless/branches/release25-maint/PCbuild8/_msi.vcproj stackless/branches/release25-maint/PCbuild8/_socket.vcproj stackless/branches/release25-maint/PCbuild8/_sqlite3.vcproj stackless/branches/release25-maint/PCbuild8/_ssl.mak stackless/branches/release25-maint/PCbuild8/_ssl.vcproj stackless/branches/release25-maint/PCbuild8/_testcapi.vcproj stackless/branches/release25-maint/PCbuild8/_tkinter.vcproj stackless/branches/release25-maint/PCbuild8/build_ssl.py stackless/branches/release25-maint/PCbuild8/bz2.vcproj stackless/branches/release25-maint/PCbuild8/db.build stackless/branches/release25-maint/PCbuild8/field3.py stackless/branches/release25-maint/PCbuild8/make_buildinfo.c stackless/branches/release25-maint/PCbuild8/make_buildinfo.vcproj stackless/branches/release25-maint/PCbuild8/make_versioninfo.vcproj stackless/branches/release25-maint/PCbuild8/pyexpat.vcproj stackless/branches/release25-maint/PCbuild8/python.build stackless/branches/release25-maint/PCbuild8/python.iss stackless/branches/release25-maint/PCbuild8/python.vcproj stackless/branches/release25-maint/PCbuild8/python20.wse stackless/branches/release25-maint/PCbuild8/pythoncore.vcproj stackless/branches/release25-maint/PCbuild8/pythonw.vcproj stackless/branches/release25-maint/PCbuild8/select.vcproj stackless/branches/release25-maint/PCbuild8/unicodedata.vcproj stackless/branches/release25-maint/PCbuild8/w9xpopen.vcproj stackless/branches/release25-maint/PCbuild8/winsound.vcproj Modified: stackless/branches/release25-maint/Modules/datetimemodule.c stackless/branches/release25-maint/Modules/getbuildinfo.c stackless/branches/release25-maint/PC/make_versioninfo.c stackless/branches/release25-maint/PCbuild8/pcbuild.sln stackless/branches/release25-maint/PCbuild8/pythoncore/pythoncore.vcproj stackless/branches/release25-maint/PCbuild8/readme.txt stackless/branches/release25-maint/PCbuild8/rmpyc.py stackless/branches/release25-maint/PCbuild8/rt.bat stackless/branches/release25-maint/Python/import.c stackless/branches/release25-maint/Python/pythonrun.c Log: Integrate recent changes to stackless25-maint, making the PCBuild8 solution up-to-date Modified: stackless/branches/release25-maint/Modules/datetimemodule.c ============================================================================== --- stackless/branches/release25-maint/Modules/datetimemodule.c (original) +++ stackless/branches/release25-maint/Modules/datetimemodule.c Sat May 5 11:55:26 2007 @@ -13,7 +13,9 @@ /* Differentiate between building the core module and building extension * modules. */ +#ifndef Py_BUILD_CORE #define Py_BUILD_CORE +#endif #include "datetime.h" #undef Py_BUILD_CORE Modified: stackless/branches/release25-maint/Modules/getbuildinfo.c ============================================================================== --- stackless/branches/release25-maint/Modules/getbuildinfo.c (original) +++ stackless/branches/release25-maint/Modules/getbuildinfo.c Sat May 5 11:55:26 2007 @@ -20,10 +20,7 @@ #endif #endif -#ifdef SUBWCREV #define SVNVERSION "$WCRANGE$$WCMODS?M:$" -#endif - const char * Py_GetBuildInfo(void) { @@ -40,9 +37,9 @@ const char * _Py_svnversion(void) { -#ifdef SVNVERSION - return SVNVERSION; -#else + /* the following string can be modified by subwcrev.exe */ + static const char svnversion[] = SVNVERSION; + if (!strstr(svnversion, "$")) + return svnversion; /* it was interpolated */ return "exported"; -#endif } Modified: stackless/branches/release25-maint/PC/make_versioninfo.c ============================================================================== --- stackless/branches/release25-maint/PC/make_versioninfo.c (original) +++ stackless/branches/release25-maint/PC/make_versioninfo.c Sat May 5 11:55:26 2007 @@ -27,7 +27,12 @@ PY_MICRO_VERSION*1000 + PY_RELEASE_LEVEL*10 + PY_RELEASE_SERIAL); printf("#define MS_DLL_ID \"%d.%d\"\n", PY_MAJOR_VERSION, PY_MINOR_VERSION); + printf("#ifndef _DEBUG\n"); printf("#define PYTHON_DLL_NAME \"python%d%d.dll\"\n", PY_MAJOR_VERSION, PY_MINOR_VERSION); + printf("#else\n"); + printf("#define PYTHON_DLL_NAME \"python%d%d_d.dll\"\n", + PY_MAJOR_VERSION, PY_MINOR_VERSION); + printf("#endif\n"); return 0; } Deleted: /stackless/branches/release25-maint/PCbuild8/Uninstal.wse ============================================================================== --- /stackless/branches/release25-maint/PCbuild8/Uninstal.wse Sat May 5 11:55:26 2007 +++ (empty file) @@ -1,514 +0,0 @@ -Document Type: WSE -item: Global - Version=8.14 - Flags=00000100 - Split=1420 - Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - Copy Default=1 - Japanese Font Name=MS Gothic - Japanese Font Size=10 - Start Gradient=0 0 255 - End Gradient=0 0 0 - Windows Flags=00000000000000000000101000001000 - Message Font=MS Sans Serif - Font Size=8 - Disk Label=GLBS - Disk Filename=INSTALL - Patch Flags=0000000000000001 - Patch Threshold=200 - Patch Memory=4096 - Per-User Version ID=1 - Crystal Format=10111100101100000010001001001001 - Step View=&Properties -end -item: Remark - Text=Note from Tim: This is a verbatim copy of Wise's Uninstal.wse, altered at the end to write -end -item: Remark - Text=uninstall info under HKCU instead of HKLM if our DOADMIN var is false. -end -item: Remark -end -item: Remark - Text= Install Support for uninstalling the application. -end -item: Remark -end -item: Set Variable - Variable=UNINSTALL_PATH - Value=%_LOGFILE_PATH_% - Flags=00000010 -end -item: Set Variable - Variable=UNINSTALL_PATH - Value=%UNINSTALL_PATH%\UNWISE.EXE -end -item: Compiler Variable If - Variable=_EXE_OS_TYPE_ - Value=WIN32 -end -item: Install File - Source=%_WISE_%\UNWISE32.EXE - Destination=%UNINSTALL_PATH% - Flags=0000000000000010 -end -item: Compiler Variable Else -end -item: Install File - Source=%_WISE_%\UNWISE.EXE - Destination=%UNINSTALL_PATH% - Flags=0000000000000010 -end -item: Compiler Variable End -end -item: Remark -end -item: Remark - Text= Install Support for multiple languages -end -item: Remark -end -item: Set Variable - Variable=UNINSTALL_LANG - Value=%UNINSTALL_PATH% - Flags=00000010 -end -item: Set Variable - Variable=UNINSTALL_LANG - Value=%UNINSTALL_LANG%\UNWISE.INI -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=C - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.FRA - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_C_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.FRA - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=D - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.FRA - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_D_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.FRA - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=E - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.DEU - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_E_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.DEU - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=F - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.PTG - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_F_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.PTG - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=G - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.ESP - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_G_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.ESP - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=H - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.ESP - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_H_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.ESP - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=I - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.ITA - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_I_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.ITA - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=J - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.DAN - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_J_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.DAN - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=K - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.FIN - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_K_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.FIN - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=L - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.ISL - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_L_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.ISL - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=M - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.NLD - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_M_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.NLD - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=N - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.NOR - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_N_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.NOR - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=O - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.SVE - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_O_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.SVE - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Compiler Variable If - Variable=_LANG_LIST_ - Value=P - Flags=00000010 -end -item: Compiler Variable If - Value=%_WISE_%\LANGUAGE\UNWISE.JPN - Flags=00000011 -end -item: If/While Statement - Variable=LANG - Value=%_LANG_P_NAME_% -end -item: Install File - Source=%_WISE_%\LANGUAGE\UNWISE.JPN - Destination=%UNINSTALL_LANG% - Flags=0000000000000010 -end -item: End Block -end -item: Compiler Variable End -end -item: Compiler Variable End -end -item: Remark -end -item: Remark - Text= Install the add/remove or uninstall icon -end -item: Remark -end -item: Set Variable - Variable=UNINSTALL_PATH - Value=%UNINSTALL_PATH% - Flags=00010100 -end -item: Set Variable - Variable=INST_LOG_PATH - Value=%_LOGFILE_PATH_% - Flags=00010100 -end -item: Check Configuration - Flags=10111011 -end -item: If/While Statement - Variable=DOADMIN - Value=1 -end -item: Remark - Text=Write uninstall info under HKLM. This if/else/end block added by Tim. -end -item: Edit Registry - Total Keys=1 - Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE% - New Value=%APPTITLE% - Value Name=DisplayName - Root=2 -end -item: Edit Registry - Total Keys=1 - Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE% - New Value=%UNINSTALL_PATH% %INST_LOG_PATH% - New Value= - Value Name=UninstallString - Root=2 -end -item: Else Statement -end -item: Remark - Text=The same, but write under HKCU instead. -end -item: Edit Registry - Total Keys=1 - Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE% - New Value=%APPTITLE% - Value Name=DisplayName - Root=1 -end -item: Edit Registry - Total Keys=1 - Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE% - New Value=%UNINSTALL_PATH% %INST_LOG_PATH% - New Value= - Value Name=UninstallString - Root=1 -end -item: End Block -end -item: Else Statement -end -item: Add ProgMan Icon - Group=%GROUP% - Icon Name=Uninstall %APPTITLE% - Command Line=%UNINSTALL_PATH% %INST_LOG_PATH% -end -item: End Block -end -item: Check Configuration - Flags=11110010 -end -item: If/While Statement - Variable=DOBRAND - Value=1 -end -item: Edit Registry - Total Keys=2 - item: Key - Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE% - New Value=%COMPANY% - Value Name=RegCompany - Root=2 - end - item: Key - Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE% - New Value=%NAME% - Value Name=RegOwner - Root=2 - end -end -item: End Block -end -item: End Block -end Deleted: /stackless/branches/release25-maint/PCbuild8/_bsddb.vcproj ============================================================================== --- /stackless/branches/release25-maint/PCbuild8/_bsddb.vcproj Sat May 5 11:55:26 2007 +++ (empty file) @@ -1,385 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Deleted: /stackless/branches/release25-maint/PCbuild8/_ctypes.vcproj ============================================================================== --- /stackless/branches/release25-maint/PCbuild8/_ctypes.vcproj Sat May 5 11:55:26 2007 +++ (empty file) @@ -1,412 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Deleted: /stackless/branches/release25-maint/PCbuild8/_ctypes_test.vcproj ============================================================================== --- /stackless/branches/release25-maint/PCbuild8/_ctypes_test.vcproj Sat May 5 11:55:26 2007 +++ (empty file) @@ -1,370 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Deleted: /stackless/branches/release25-maint/PCbuild8/_elementtree.vcproj ============================================================================== --- /stackless/branches/release25-maint/PCbuild8/_elementtree.vcproj Sat May 5 11:55:26 2007 +++ (empty file) @@ -1,390 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Deleted: /stackless/branches/release25-maint/PCbuild8/_msi.vcproj ============================================================================== --- /stackless/branches/release25-maint/PCbuild8/_msi.vcproj Sat May 5 11:55:26 2007 +++ (empty file) @@ -1,375 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Deleted: /stackless/branches/release25-maint/PCbuild8/_socket.vcproj ============================================================================== --- /stackless/branches/release25-maint/PCbuild8/_socket.vcproj Sat May 5 11:55:26 2007 +++ (empty file) @@ -1,381 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Deleted: /stackless/branches/release25-maint/PCbuild8/_sqlite3.vcproj ============================================================================== --- /stackless/branches/release25-maint/PCbuild8/_sqlite3.vcproj Sat May 5 11:55:26 2007 +++ (empty file) @@ -1,411 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Deleted: /stackless/branches/release25-maint/PCbuild8/_ssl.mak ============================================================================== --- /stackless/branches/release25-maint/PCbuild8/_ssl.mak Sat May 5 11:55:26 2007 +++ (empty file) @@ -1,21 +0,0 @@ - -!IFDEF DEBUG -MODULE=_ssl_d.pyd -TEMP_DIR=x86-temp-debug/_ssl -CFLAGS=/Od /Zi /MDd /LDd /DDEBUG /D_DEBUG /DWIN32 -SSL_LIB_DIR=$(SSL_DIR)/out32.dbg -!ELSE -MODULE=_ssl.pyd -TEMP_DIR=x86-temp-release/_ssl -CFLAGS=/Ox /MD /LD /DWIN32 -SSL_LIB_DIR=$(SSL_DIR)/out32 -!ENDIF - -INCLUDES=-I ../Include -I ../PC -I $(SSL_DIR)/inc32 -LIBS=gdi32.lib wsock32.lib user32.lib advapi32.lib /libpath:$(SSL_LIB_DIR) libeay32.lib ssleay32.lib - -SOURCE=../Modules/_ssl.c $(SSL_LIB_DIR)/libeay32.lib $(SSL_LIB_DIR)/ssleay32.lib - -$(MODULE): $(SOURCE) ../PC/*.h ../Include/*.h - @if not exist "$(TEMP_DIR)/." mkdir "$(TEMP_DIR)" - cl /nologo $(SOURCE) $(CFLAGS) /Fo$(TEMP_DIR)\$*.obj $(INCLUDES) /link /out:$(MODULE) $(LIBS) Deleted: /stackless/branches/release25-maint/PCbuild8/_ssl.vcproj ============================================================================== --- /stackless/branches/release25-maint/PCbuild8/_ssl.vcproj Sat May 5 11:55:26 2007 +++ (empty file) @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Deleted: /stackless/branches/release25-maint/PCbuild8/_testcapi.vcproj ============================================================================== --- /stackless/branches/release25-maint/PCbuild8/_testcapi.vcproj Sat May 5 11:55:26 2007 +++ (empty file) @@ -1,374 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Deleted: /stackless/branches/release25-maint/PCbuild8/_tkinter.vcproj ============================================================================== --- /stackless/branches/release25-maint/PCbuild8/_tkinter.vcproj Sat May 5 11:55:26 2007 +++ (empty file) @@ -1,389 +0,0 @@ - - - - - - - - - - - - - - -