This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12226

cext: remove Python 2 file handling code
ClosedPublic

Authored by indygreg on Mar 1 2022, 7:21 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGe9ca736f5b52: cext: remove Python 2 file handling code

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Mar 1 2022, 7:21 PM
Alphare accepted this revision.Mar 2 2022, 5:17 AM
This revision is now accepted and ready to land.Mar 2 2022, 5:17 AM
indygreg added a commit: rHGe9ca736f5b52: cext: remove Python 2 file handling code.Mar 2 2022, 7:41 AM
Closed by commit rHGe9ca736f5b52: cext: remove Python 2 file handling code (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cext/osutil.c (8 lines)

Diff 32342

mercurial/cext/osutil.c

DWORD creation; DWORD creation;
HANDLE handle; HANDLE handle;
int fd, flags = 0; int fd, flags = 0;
int bufsize = -1; int bufsize = -1;
char m0, m1, m2; char m0, m1, m2;
char fpmode[4]; char fpmode[4];
int fppos = 0; int fppos = 0;
int plus; int plus;
#ifndef IS_PY3K
FILE *fp; FILE *fp;
#endif
if (!PyArg_ParseTupleAndKeywords(args, kwds, PY23("et|si:posixfile", if (!PyArg_ParseTupleAndKeywords(args, kwds, PY23("et|si:posixfile",
"et|yi:posixfile"), "et|yi:posixfile"),
kwlist, kwlist,
Py_FileSystemDefaultEncoding, Py_FileSystemDefaultEncoding,
&name, &mode, &bufsize)) &name, &mode, &bufsize))
return NULL; return NULL;
fd = _open_osfhandle((intptr_t)handle, flags); fd = _open_osfhandle((intptr_t)handle, flags);
if (fd == -1) { if (fd == -1) {
CloseHandle(handle); CloseHandle(handle);
PyErr_SetFromErrnoWithFilename(PyExc_IOError, name); PyErr_SetFromErrnoWithFilename(PyExc_IOError, name);
goto bail; goto bail;
} }
#ifndef IS_PY3K
fp = _fdopen(fd, fpmode); fp = _fdopen(fd, fpmode);
if (fp == NULL) { if (fp == NULL) {
_close(fd); _close(fd);
PyErr_SetFromErrnoWithFilename(PyExc_IOError, name); PyErr_SetFromErrnoWithFilename(PyExc_IOError, name);
goto bail; goto bail;
} }
file_obj = PyFile_FromFile(fp, name, mode, fclose); file_obj = PyFile_FromFile(fp, name, mode, fclose);
if (file_obj == NULL) { if (file_obj == NULL) {
fclose(fp); fclose(fp);
goto bail; goto bail;
} }
PyFile_SetBufSize(file_obj, bufsize); 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: bail:
PyMem_Free(name); PyMem_Free(name);
return file_obj; return file_obj;
} }
#endif #endif
#ifdef __APPLE__ #ifdef __APPLE__
#include <ApplicationServices/ApplicationServices.h> #include <ApplicationServices/ApplicationServices.h>