[Python-checkins] python/dist/src/Objects fileobject.c,2.191,2.192

[montanaro at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Objects
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32103

Modified Files:
	fileobject.c 
Log Message:
dump HAVE_FOPENRF stuff - obsolete


Index: fileobject.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Objects/fileobject.c,v
retrieving revision 2.191
retrieving revision 2.192
diff -C2 -d -r2.191 -r2.192
*** fileobject.c	31 May 2004 00:35:51 -0000	2.191
--- fileobject.c	11 Jun 2004 04:49:03 -0000	2.192
***************
*** 152,186 ****
  	}
  	errno = 0;
! #ifdef HAVE_FOPENRF
! 	if (*mode == '*') {
! 		FILE *fopenRF();
! 		f->f_fp = fopenRF(name, mode+1);
! 	}
! 	else
! #endif
! 	{
! 		if (strcmp(mode, "U") == 0 || strcmp(mode, "rU") == 0)
! 			mode = "rb";
  #ifdef MS_WINDOWS
! 		if (PyUnicode_Check(f->f_name)) {
! 			PyObject *wmode;
! 			wmode = PyUnicode_DecodeASCII(mode, strlen(mode), NULL);
! 			if (f->f_name && wmode) {
! 				Py_BEGIN_ALLOW_THREADS
! 				/* PyUnicode_AS_UNICODE OK without thread
! 				   lock as it is a simple dereference. */
! 				f->f_fp = _wfopen(PyUnicode_AS_UNICODE(f->f_name),
! 						  PyUnicode_AS_UNICODE(wmode));
! 				Py_END_ALLOW_THREADS
! 			}
! 			Py_XDECREF(wmode);
! 		}
! #endif
! 		if (NULL == f->f_fp && NULL != name) {
  			Py_BEGIN_ALLOW_THREADS
! 			f->f_fp = fopen(name, mode);
  			Py_END_ALLOW_THREADS
  		}
  	}
  	if (f->f_fp == NULL) {
  #ifdef _MSC_VER
--- 152,179 ----
  	}
  	errno = 0;
! 
! 	if (strcmp(mode, "U") == 0 || strcmp(mode, "rU") == 0)
! 		mode = "rb";
  #ifdef MS_WINDOWS
! 	if (PyUnicode_Check(f->f_name)) {
! 		PyObject *wmode;
! 		wmode = PyUnicode_DecodeASCII(mode, strlen(mode), NULL);
! 		if (f->f_name && wmode) {
  			Py_BEGIN_ALLOW_THREADS
! 			/* PyUnicode_AS_UNICODE OK without thread
! 			   lock as it is a simple dereference. */
! 			f->f_fp = _wfopen(PyUnicode_AS_UNICODE(f->f_name),
! 					  PyUnicode_AS_UNICODE(wmode));
  			Py_END_ALLOW_THREADS
  		}
+ 		Py_XDECREF(wmode);
  	}
+ #endif
+ 	if (NULL == f->f_fp && NULL != name) {
+ 		Py_BEGIN_ALLOW_THREADS
+ 		f->f_fp = fopen(name, mode);
+ 		Py_END_ALLOW_THREADS
+ 	}
+ 
  	if (f->f_fp == NULL) {
  #ifdef _MSC_VER