[Python-checkins] python/dist/src/Python compile.c,2.246,2.247

[rhettinger@users.sourceforge.net]

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

Modified Files:
	compile.c 
Log Message:
SF 569257 -- Name mangle double underscored variable names in __slots__.


Index: compile.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/compile.c,v
retrieving revision 2.246
retrieving revision 2.247
diff -C2 -d -r2.246 -r2.247
*** compile.c	14 Jun 2002 20:41:16 -0000	2.246
--- compile.c	20 Jun 2002 22:23:14 -0000	2.247
***************
*** 929,934 ****
  }
  
! static int
! mangle(char *p, char *name, char *buffer, size_t maxlen)
  {
  	/* Name mangling: __private becomes _classname__private.
--- 929,934 ----
  }
  
! int
! _Py_Mangle(char *p, char *name, char *buffer, size_t maxlen)
  {
  	/* Name mangling: __private becomes _classname__private.
***************
*** 964,968 ****
  	char buffer[MANGLE_LEN];
  
! 	if (mangle(c->c_private, name, buffer, sizeof(buffer)))
  		name = buffer;
  	if (name == NULL || (v = PyString_InternFromString(name)) == NULL) {
--- 964,968 ----
  	char buffer[MANGLE_LEN];
  
! 	if (_Py_Mangle(c->c_private, name, buffer, sizeof(buffer)))
  		name = buffer;
  	if (name == NULL || (v = PyString_InternFromString(name)) == NULL) {
***************
*** 1001,1005 ****
  	char buffer[MANGLE_LEN];
  
! 	if (mangle(c->c_private, name, buffer, sizeof(buffer)))
  		name = buffer;
  	if (name == NULL || (v = PyString_InternFromString(name)) == NULL) {
--- 1001,1005 ----
  	char buffer[MANGLE_LEN];
  
! 	if (_Py_Mangle(c->c_private, name, buffer, sizeof(buffer)))
  		name = buffer;
  	if (name == NULL || (v = PyString_InternFromString(name)) == NULL) {
***************
*** 4957,4961 ****
  	int flags;
  
! 	if (mangle(st->st_private, name, buffer, sizeof(buffer)))
  		name = buffer;
  	v = PyDict_GetItemString(st->st_cur->ste_symbols, name);
--- 4957,4961 ----
  	int flags;
  
! 	if (_Py_Mangle(st->st_private, name, buffer, sizeof(buffer)))
  		name = buffer;
  	v = PyDict_GetItemString(st->st_cur->ste_symbols, name);
***************
*** 4978,4982 ****
  	int ret;
  
! 	if (mangle(st->st_private, name, buffer, sizeof(buffer)))
  		name = buffer;
  	if ((s = PyString_InternFromString(name)) == NULL)
--- 4978,4982 ----
  	int ret;
  
! 	if (_Py_Mangle(st->st_private, name, buffer, sizeof(buffer)))
  		name = buffer;
  	if ((s = PyString_InternFromString(name)) == NULL)