diff --git a/mercurial/cext/osutil.c b/mercurial/cext/osutil.c index 499733de460faf0d8cee6ea5e22bd05cec2fc93c_bWVyY3VyaWFsL2NleHQvb3N1dGlsLmM=..2ef3b7d30cc1df92f52bc5ef04b8e549db971095_bWVyY3VyaWFsL2NleHQvb3N1dGlsLmM= 100644 --- a/mercurial/cext/osutil.c +++ b/mercurial/cext/osutil.c @@ -1176,9 +1176,6 @@ char fpmode[4]; int fppos = 0; int plus; -#ifndef IS_PY3K - FILE *fp; -#endif if (!PyArg_ParseTupleAndKeywords(args, kwds, "et|yi:posixfile", kwlist, @@ -1250,22 +1247,6 @@ 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; @@ -1269,7 +1250,6 @@ 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;