( )⚙ D12222 cext: drop preprocessor PyInt aliases

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12222

cext: drop preprocessor PyInt aliases
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG92c430e7e37a: cext: drop preprocessor PyInt aliases
Summary

Now that we dropped support for Python 2 we can use the Python 3 native
functions.

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:13 AM
This revision is now accepted and ready to land.Mar 2 2022, 5:13 AM
indygreg added a commit: rHG92c430e7e37a: cext: drop preprocessor PyInt aliases.Mar 2 2022, 7:41 AM
Closed by commit rHG92c430e7e37a: cext: drop preprocessor PyInt aliases (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cext/charencode.c (12 lines)

Diff 32338

mercurial/cext/charencode.c

#define PY_SSIZE_T_CLEAN #define PY_SSIZE_T_CLEAN
#include <Python.h> #include <Python.h>
#include <assert.h> #include <assert.h>
#include "charencode.h" #include "charencode.h"
#include "compat.h" #include "compat.h"
#include "util.h" #include "util.h"
#ifdef IS_PY3K
/* The mapping of Python types is meant to be temporary to get Python
* 3 to compile. We should remove this once Python 3 support is fully
* supported and proper types are used in the extensions themselves. */
#define PyInt_Type PyLong_Type
#define PyInt_AS_LONG PyLong_AS_LONG
#endif
/* clang-format off */ /* clang-format off */
static const char lowertable[128] = { static const char lowertable[128] = {
'\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07', '\x00', '\x01', '\x02', '\x03', '\x04', '\x05', '\x06', '\x07',
'\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f', '\x08', '\x09', '\x0a', '\x0b', '\x0c', '\x0d', '\x0e', '\x0f',
'\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17', '\x10', '\x11', '\x12', '\x13', '\x14', '\x15', '\x16', '\x17',
'\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f', '\x18', '\x19', '\x1a', '\x1b', '\x1c', '\x1d', '\x1e', '\x1f',
'\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27', '\x20', '\x21', '\x22', '\x23', '\x24', '\x25', '\x26', '\x27',
'\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f', '\x28', '\x29', '\x2a', '\x2b', '\x2c', '\x2d', '\x2e', '\x2f',
PyObject *file_foldmap = NULL; PyObject *file_foldmap = NULL;
enum normcase_spec spec; enum normcase_spec spec;
PyObject *k, *v; PyObject *k, *v;
dirstateItemObject *tuple; dirstateItemObject *tuple;
Py_ssize_t pos = 0; Py_ssize_t pos = 0;
const char *table; const char *table;
if (!PyArg_ParseTuple(args, "O!O!O!:make_file_foldmap", &PyDict_Type, if (!PyArg_ParseTuple(args, "O!O!O!:make_file_foldmap", &PyDict_Type,
&dmap, &PyInt_Type, &spec_obj, &PyFunction_Type, &dmap, &PyLong_Type, &spec_obj, &PyFunction_Type,
&normcase_fallback)) { &normcase_fallback)) {
goto quit; goto quit;
} }
spec = (int)PyInt_AS_LONG(spec_obj); spec = (int)PyLong_AS_LONG(spec_obj);
switch (spec) { switch (spec) {
case NORMCASE_LOWER: case NORMCASE_LOWER:
table = lowertable; table = lowertable;
break; break;
case NORMCASE_UPPER: case NORMCASE_UPPER:
table = uppertable; table = uppertable;
break; break;
case NORMCASE_OTHER: case NORMCASE_OTHER: