[Stackless-checkins] CVS: slpdev/src/2.2/src/Modules _hotshot.c, 1.3, 1.4 _tkinter.c, 1.5, 1.6 cPickle.c, 1.6, 1.7

Christian Tismer tismer at centera.de
Sat May 1 00:11:29 CEST 2004


Update of /home/cvs/slpdev/src/2.2/src/Modules
In directory centera.de:/tmp/cvs-serv13270/src/Modules

Modified Files:
	_hotshot.c _tkinter.c cPickle.c 
Log Message:
checking Python 2.2.3 back in, almost unmodified.
The only modifications are in PCbuild, and the additon of the
new Stackless for 2.3.3 trunk.

Purpose: I will apply all current changes to 2.3.3 back to 2.2.3.
Since I'm unsure how to do this on the current dev trunk by CVS,
and since I never imported 2.2.3 before, I prefer to do it this
way, using the merge program explicitly.


Index: _hotshot.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.2/src/Modules/_hotshot.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** _hotshot.c	16 Oct 2002 00:47:31 -0000	1.3
--- _hotshot.c	30 Apr 2004 22:11:26 -0000	1.4
***************
*** 1594,1598 ****
  
  
! DL_IMPORT(void)
  init_hotshot(void)
  {
--- 1594,1598 ----
  
  
! void
  init_hotshot(void)
  {

Index: _tkinter.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.2/src/Modules/_tkinter.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** _tkinter.c	21 Aug 2003 16:59:16 -0000	1.5
--- _tkinter.c	30 Apr 2004 22:11:26 -0000	1.6
***************
*** 1203,1207 ****
  	if (!(v = PyTuple_New(argc)))
  		goto finally;
! 	
  	for (i = 0; i < argc; i++) {
  		PyObject *s = PyString_FromString(argv[i]);
--- 1203,1207 ----
  	if (!(v = PyTuple_New(argc)))
  		goto finally;
! 
  	for (i = 0; i < argc; i++) {
  		PyObject *s = PyString_FromString(argv[i]);
***************
*** 1295,1301 ****
  		}
  	}
- 
  	res = PyEval_CallObject(func, arg);
- 
  	Py_DECREF(arg);
  
--- 1295,1299 ----

Index: cPickle.c
===================================================================
RCS file: /home/cvs/slpdev/src/2.2/src/Modules/cPickle.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** cPickle.c	24 Feb 2004 16:35:35 -0000	1.6
--- cPickle.c	30 Apr 2004 22:11:26 -0000	1.7
***************
*** 658,662 ****
  static int
  put(Picklerobject *self, PyObject *ob) {
!     if (ob->ob_refcnt < 2 || self->fast) 
          return 0;
  
--- 658,662 ----
  static int
  put(Picklerobject *self, PyObject *ob) {
!     if (ob->ob_refcnt < 2 || self->fast)
          return 0;
  
***************
*** 874,878 ****
  }
  
! int 
  fast_save_leave(Picklerobject *self, PyObject *obj)
  {
--- 874,878 ----
  }
  
! int
  fast_save_leave(Picklerobject *self, PyObject *obj)
  {
***************
*** 1907,1916 ****
                  goto finally;
              }
- #ifdef STACKLESS
-             if (type == &PyFunction_Type) {
-                 res = save_global(self, args, NULL);
-                 goto finally;
-             }
- #endif
              break;
  
--- 1907,1910 ----
***************
*** 2080,2086 ****
  static PyObject *
  Pickle_clear_memo(Picklerobject *self, PyObject *args) {
!     if (!PyArg_ParseTuple(args,":clear_memo")) 
  	return NULL;
!     if (self->memo) 
  	PyDict_Clear(self->memo);
      Py_INCREF(Py_None);
--- 2074,2080 ----
  static PyObject *
  Pickle_clear_memo(Picklerobject *self, PyObject *args) {
!     if (!PyArg_ParseTuple(args,":clear_memo"))
  	return NULL;
!     if (self->memo)
  	PyDict_Clear(self->memo);
      Py_INCREF(Py_None);
***************
*** 2097,2101 ****
  
    /* Can be called by Python code or C code */
!   if (args && !PyArg_ParseTuple(args, "|i:getvalue", &clear)) 
        return NULL;
  
--- 2091,2095 ----
  
    /* Can be called by Python code or C code */
!   if (args && !PyArg_ParseTuple(args, "|i:getvalue", &clear))
        return NULL;
  
***************
*** 2498,2502 ****
  
  static PyGetSetDef Pickler_getsets[] = {
!     {"persistent_id", (getter)Pickler_get_pers_func, 
                       (setter)Pickler_set_pers_func},
      {"inst_persistent_id", NULL, (setter)Pickler_set_inst_pers_func},
--- 2492,2496 ----
  
  static PyGetSetDef Pickler_getsets[] = {
!     {"persistent_id", (getter)Pickler_get_pers_func,
                       (setter)Pickler_set_pers_func},
      {"inst_persistent_id", NULL, (setter)Pickler_set_inst_pers_func},
***************
*** 4549,4565 ****
  static PyTypeObject Unpicklertype = {
      PyObject_HEAD_INIT(NULL)
!     0,                            /*ob_size*/
!     "cPickle.Unpickler",                  /*tp_name*/
!     sizeof(Unpicklerobject),              /*tp_basicsize*/
      0,
!     (destructor)Unpickler_dealloc,        /*tp_dealloc*/
      0,					/* tp_print */
!     (getattrfunc)Unpickler_getattr,       /*tp_getattr*/
!     (setattrfunc)Unpickler_setattr,       /*tp_setattr*/
      0,					/* tp_compare */
      0,		 			/* tp_repr */
!     0,                    /*tp_as_number*/
!     0,            /*tp_as_sequence*/
!     0,            /*tp_as_mapping*/
      0,					/* tp_hash */
      0,					/* tp_call */
--- 4543,4559 ----
  static PyTypeObject Unpicklertype = {
      PyObject_HEAD_INIT(NULL)
!     0,                          	 /*ob_size*/
!     "cPickle.Unpickler", 	         /*tp_name*/
!     sizeof(Unpicklerobject),             /*tp_basicsize*/
      0,
!     (destructor)Unpickler_dealloc,	/* tp_dealloc */
      0,					/* tp_print */
!     (getattrfunc)Unpickler_getattr,	/* tp_getattr */
!     (setattrfunc)Unpickler_setattr,	/* tp_setattr */
      0,					/* tp_compare */
      0,		 			/* tp_repr */
!     0,					/* tp_as_number */
!     0,					/* tp_as_sequence */
!     0,					/* tp_as_mapping */
      0,					/* tp_hash */
      0,					/* tp_call */


_______________________________________________
Stackless-checkins mailing list
Stackless-checkins at stackless.com
http://www.stackless.com/mailman/listinfo/stackless-checkins



More information about the Stackless-checkins mailing list