[Python-checkins] python/dist/src/Objects bufferobject.c,2.18,2.19

[rhettinger@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Objects
In directory usw-pr-cvs1:/tmp/cvs-serv8578/Objects

Modified Files:
	bufferobject.c 
Log Message:
Fix SF bug 546434 -- buffer slice type inconsistent.


Index: bufferobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/bufferobject.c,v
retrieving revision 2.18
retrieving revision 2.19
diff -C2 -d -r2.18 -r2.19
*** bufferobject.c	14 Jun 2002 20:41:14 -0000	2.18
--- bufferobject.c	25 Jun 2002 00:25:30 -0000	2.19
***************
*** 297,307 ****
  		return NULL;
  
- 	/* optimize special case */
- 	if ( count == 0 )
- 	{
- 	    Py_INCREF(self);
- 	    return (PyObject *)self;
- 	}
- 
  	ob = PyString_FromStringAndSize(NULL, self->b_size + count);
  	p1 = PyString_AS_STRING(ob);
--- 297,300 ----
***************
*** 362,371 ****
  	if ( right > self->b_size )
  		right = self->b_size;
- 	if ( left == 0 && right == self->b_size )
- 	{
- 		/* same as self */
- 		Py_INCREF(self);
- 		return (PyObject *)self;
- 	}
  	if ( right < left )
  		right = left;
--- 355,358 ----