[PATCH 1 of 2] cext: backout e9ca736f5b52 "remove Python 2 file handling code"

[Gregory Szorc]

*facepalm*

Queued, thanks.

On Wed, Mar 2, 2022 at 7:42 PM Yuya Nishihara <yuya at tcha.org> wrote:

> # HG changeset patch
> # User Yuya Nishihara <yuya at tcha.org>
> # Date 1646268190 -32400
> #      Thu Mar 03 09:43:10 2022 +0900
> # Node ID 499733de460faf0d8cee6ea5e22bd05cec2fc93c
> # Parent  7b068abe4aa2d1848cf91c2c203b68aa59feaaf7
> cext: backout e9ca736f5b52 "remove Python 2 file handling code"
>
> It's if"n"def.
>
> diff --git a/mercurial/cext/osutil.c b/mercurial/cext/osutil.c
> --- a/mercurial/cext/osutil.c
> +++ b/mercurial/cext/osutil.c
> @@ -1176,7 +1176,9 @@ static PyObject *posixfile(PyObject *sel
>         char fpmode[4];
>         int fppos = 0;
>         int plus;
> +#ifndef IS_PY3K
>         FILE *fp;
> +#endif
>
>         if (!PyArg_ParseTupleAndKeywords(args, kwds, "et|yi:posixfile",
>                                          kwlist,
> @@ -1248,6 +1250,7 @@ static PyObject *posixfile(PyObject *sel
>                 PyErr_SetFromErrnoWithFilename(PyExc_IOError, name);
>                 goto bail;
>         }
> +#ifndef IS_PY3K
>         fp = _fdopen(fd, fpmode);
>         if (fp == NULL) {
>                 _close(fd);
> @@ -1262,6 +1265,11 @@ static PyObject *posixfile(PyObject *sel
>         }
>
>         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;
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-devel/attachments/20220302/62ae2b12/attachment-0002.html>