comparison mercurial/cext/osutil.c @ 48841:2ef3b7d30cc1

cext: really remove Python 2 file handling code

Disclaimer: This is _WIN32 code and I have no machine to test.

48840:499733de460f

	int bufsize = -1;
	char m0, m1, m2;
	char fpmode[4];
	int fppos = 0;
	int plus;
#ifndef IS_PY3K
	FILE *fp;
#endif

	if (!PyArg_ParseTupleAndKeywords(args, kwds, "et|yi:posixfile",
					 kwlist,
					 Py_FileSystemDefaultEncoding,
					 &name, &mode, &bufsize))

	if (fd == -1) {
		CloseHandle(handle);
		PyErr_SetFromErrnoWithFilename(PyExc_IOError, name);
		goto bail;
	}
#ifndef IS_PY3K
	fp = _fdopen(fd, fpmode);
	if (fp == NULL) {
		_close(fd);
		PyErr_SetFromErrnoWithFilename(PyExc_IOError, name);
		goto bail;
	}

	file_obj = PyFile_FromFile(fp, name, mode, fclose);
	if (file_obj == NULL) {
		fclose(fp);
		goto bail;
	}

	PyFile_SetBufSize(file_obj, bufsize);
#else
	file_obj = PyFile_FromFd(fd, name, mode, bufsize, NULL, NULL, NULL, 1);
	if (file_obj == NULL)
		goto bail;
#endif
bail:
	PyMem_Free(name);
	return file_obj;
}
#endif

48841:2ef3b7d30cc1

	int bufsize = -1;
	char m0, m1, m2;
	char fpmode[4];
	int fppos = 0;
	int plus;

	if (!PyArg_ParseTupleAndKeywords(args, kwds, "et|yi:posixfile",
					 kwlist,
					 Py_FileSystemDefaultEncoding,
					 &name, &mode, &bufsize))

	if (fd == -1) {
		CloseHandle(handle);
		PyErr_SetFromErrnoWithFilename(PyExc_IOError, name);
		goto bail;
	}
	file_obj = PyFile_FromFd(fd, name, mode, bufsize, NULL, NULL, NULL, 1);
	if (file_obj == NULL)
		goto bail;
bail:
	PyMem_Free(name);
	return file_obj;
}
#endif