[Stackless] stackess for 2.7

Jeff Senn senn at maya.com
Wed Jun 30 14:57:44 CEST 2010


Ok - I committed what I have (except for the Mac/BuildScript change which involves Tk, and since I can't get it to work completely yet, I'm not sure about).

As Richard mentioned, several of the build changes are things that were somehow lost in merging.

On Jun 30, 2010, at 5:28 AM, Kristján Valur Jónsson wrote:

> Jeff, please commit those changes to setup.py and descrobject.c.
> I was not able to confirm line ending differences in Lib/*.
> It is probably due to me being on windows, and svn doing some line ending magic for me.  If you could fix it on unix, that would be great.
> K
> 
>> -----Original Message-----
>> From: stackless-bounces at stackless.com [mailto:stackless-
>> bounces at stackless.com] On Behalf Of Jeff Senn
>> Sent: 30. júní 2010 03:24
>> To: The Stackless Python Mailing List
>> Subject: Re: [Stackless] stackess for 2.7
>> 
>> The Lib/test ones were indeed compatible.  I also have changes:
>> 
>> to the build environment for unix/os-x:
>> 
>> M       configure
>> M       configure.in
>> M       Makefile.pre.in
>> M       Mac/BuildScript/build-installer.py
>> 
>> Yes, Richard, I'll commit these at some point soon.
>> 
>> M       setup.py
>> 
>> This adds the stackless dependency to the build for the cPickle
>> extension:
>> 
>> -------------snip--------------
>> Index: setup.py
>> ===================================================================
>> --- setup.py	(revision 82382)
>> +++ setup.py	(working copy)
>> @@ -549,7 +549,7 @@
>> 
>>         # cStringIO and cPickle
>>         exts.append( Extension('cStringIO', ['cStringIO.c']) )
>> -        exts.append( Extension('cPickle', ['cPickle.c']) )
>> +        exts.append( Extension('cPickle', ['cPickle.c',
>> '../Stackless/pickling/safe_pickle.c']) )
>> 
>>         # Memory-mapped files (also works on Win32).
>>         if platform not in ['atheos']:
>> -------------snip--------------
>> 
>> M       Objects/descrobject.c
>> 
>> This one is necessary for gcc, but maybe not for windows. The diff
>> rectifies
>> a conflicting static/non-static decl of 2 type structs for the
>> stackless version
>> (I also cleaned an unused variable, "pnew"):
>> 
>> -------------snip--------------
>> Index: Objects/descrobject.c
>> ===================================================================
>> --- Objects/descrobject.c	(revision 82382)
>> +++ Objects/descrobject.c	(working copy)
>> @@ -478,7 +478,10 @@
>> 
>> STACKLESS_DECLARE_METHOD(&PyClassMethodDescr_Type, tp_call)
>> 
>> -static PyTypeObject PyMemberDescr_Type = {
>> +#ifndef STACKLESS
>> +static
>> +#endif
>> +PyTypeObject PyMemberDescr_Type = {
>>     PyVarObject_HEAD_INIT(&PyType_Type, 0)
>>     "member_descriptor",
>>     sizeof(PyMemberDescrObject),
>> @@ -515,7 +518,10 @@
>>     (descrsetfunc)member_set,                   /* tp_descr_set */
>> };
>> 
>> -static PyTypeObject PyGetSetDescr_Type = {
>> +#ifndef STACKLESS
>> +static
>> +#endif
>> +PyTypeObject PyGetSetDescr_Type = {
>>     PyVarObject_HEAD_INIT(&PyType_Type, 0)
>>     "getset_descriptor",
>>     sizeof(PyGetSetDescrObject),
>> @@ -1254,7 +1260,6 @@
>>                 PyObject *doc)
>> {
>>     propertyobject *pold = (propertyobject *)old;
>> -    propertyobject *pnew = NULL;
>>     PyObject *new, *type;
>> 
>>     type = PyObject_Type(old);
>> -------------snip--------------
>> 
>> And these last have messed up line endings compared to regular python
>> (i.e. you could just revert them to the version in the regular python
>> trunk)
>> 
>> M       Lib/email/test/data/msg_45.txt
>> M       Lib/email/test/data/msg_46.txt
>> M       Lib/test/xmltestdata/test.xml.out
>> M       Lib/test/xmltestdata/simple-ns.xml
>> M       Lib/test/xmltestdata/simple.xml
>> M       Lib/test/xmltestdata/test.xml
>> 
>> 
> 
> 
> _______________________________________________
> Stackless mailing list
> Stackless at stackless.com
> http://www.stackless.com/mailman/listinfo/stackless
> 




More information about the Stackless mailing list