This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12228

cext: use PyLong symbols
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGc1ad4364a5b5: cext: use PyLong symbols
Summary

We no longer need to support Python 2. So use the Python 3 symbol
names directly.

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:22 PM
Alphare accepted this revision.Mar 2 2022, 5:18 AM
This revision is now accepted and ready to land.Mar 2 2022, 5:18 AM
indygreg added a commit: rHGc1ad4364a5b5: cext: use PyLong symbols.Mar 2 2022, 7:42 AM
Closed by commit rHGc1ad4364a5b5: cext: use PyLong symbols (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cext/parsers.c (22 lines)

Diff 32344

mercurial/cext/parsers.c

#include <ctype.h> #include <ctype.h>
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#include "bitmanipulation.h" #include "bitmanipulation.h"
#include "charencode.h" #include "charencode.h"
#include "util.h" #include "util.h"
/* 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_Check PyLong_Check
#define PyInt_FromLong PyLong_FromLong
#define PyInt_FromSsize_t PyLong_FromSsize_t
#define PyInt_AsLong PyLong_AsLong
static const char *const versionerrortext = "Python minor version mismatch"; static const char *const versionerrortext = "Python minor version mismatch";
static const int dirstate_v1_from_p2 = -2; static const int dirstate_v1_from_p2 = -2;
static const int dirstate_v1_nonnormal = -1; static const int dirstate_v1_nonnormal = -1;
static const int ambiguous_time = -1; static const int ambiguous_time = -1;
static PyObject *dict_new_presized(PyObject *self, PyObject *args) static PyObject *dict_new_presized(PyObject *self, PyObject *args)
{ {
static PyObject *dirstate_item_v1_state(dirstateItemObject *self) static PyObject *dirstate_item_v1_state(dirstateItemObject *self)
{ {
char state = dirstate_item_c_v1_state(self); char state = dirstate_item_c_v1_state(self);
return PyBytes_FromStringAndSize(&state, 1); return PyBytes_FromStringAndSize(&state, 1);
}; };
static PyObject *dirstate_item_v1_mode(dirstateItemObject *self) static PyObject *dirstate_item_v1_mode(dirstateItemObject *self)
{ {
return PyInt_FromLong(dirstate_item_c_v1_mode(self)); return PyLong_FromLong(dirstate_item_c_v1_mode(self));
}; };
static PyObject *dirstate_item_v1_size(dirstateItemObject *self) static PyObject *dirstate_item_v1_size(dirstateItemObject *self)
{ {
return PyInt_FromLong(dirstate_item_c_v1_size(self)); return PyLong_FromLong(dirstate_item_c_v1_size(self));
}; };
static PyObject *dirstate_item_v1_mtime(dirstateItemObject *self) static PyObject *dirstate_item_v1_mtime(dirstateItemObject *self)
{ {
return PyInt_FromLong(dirstate_item_c_v1_mtime(self)); return PyLong_FromLong(dirstate_item_c_v1_mtime(self));
}; };
static PyObject *dirstate_item_mtime_likely_equal_to(dirstateItemObject *self, static PyObject *dirstate_item_mtime_likely_equal_to(dirstateItemObject *self,
PyObject *other) PyObject *other)
{ {
int other_s; int other_s;
int other_ns; int other_ns;
int other_second_ambiguous; int other_second_ambiguous;
"mark a file as \"untracked\""}, "mark a file as \"untracked\""},
{"drop_merge_data", (PyCFunction)dirstate_item_drop_merge_data, METH_NOARGS, {"drop_merge_data", (PyCFunction)dirstate_item_drop_merge_data, METH_NOARGS,
"remove all \"merge-only\" from a DirstateItem"}, "remove all \"merge-only\" from a DirstateItem"},
{NULL} /* Sentinel */ {NULL} /* Sentinel */
}; };
static PyObject *dirstate_item_get_mode(dirstateItemObject *self) static PyObject *dirstate_item_get_mode(dirstateItemObject *self)
{ {
return PyInt_FromLong(dirstate_item_c_v1_mode(self)); return PyLong_FromLong(dirstate_item_c_v1_mode(self));
}; };
static PyObject *dirstate_item_get_size(dirstateItemObject *self) static PyObject *dirstate_item_get_size(dirstateItemObject *self)
{ {
return PyInt_FromLong(dirstate_item_c_v1_size(self)); return PyLong_FromLong(dirstate_item_c_v1_size(self));
}; };
static PyObject *dirstate_item_get_mtime(dirstateItemObject *self) static PyObject *dirstate_item_get_mtime(dirstateItemObject *self)
{ {
return PyInt_FromLong(dirstate_item_c_v1_mtime(self)); return PyLong_FromLong(dirstate_item_c_v1_mtime(self));
}; };
static PyObject *dirstate_item_get_state(dirstateItemObject *self) static PyObject *dirstate_item_get_state(dirstateItemObject *self)
{ {
char state = dirstate_item_c_v1_state(self); char state = dirstate_item_c_v1_state(self);
return PyBytes_FromStringAndSize(&state, 1); return PyBytes_FromStringAndSize(&state, 1);
}; };
if (!sys) { if (!sys) {
return -1; return -1;
} }
ver = PyObject_GetAttrString(sys, "hexversion"); ver = PyObject_GetAttrString(sys, "hexversion");
Py_DECREF(sys); Py_DECREF(sys);
if (!ver) { if (!ver) {
return -1; return -1;
} }
hexversion = PyInt_AsLong(ver); hexversion = PyLong_AsLong(ver);
Py_DECREF(ver); Py_DECREF(ver);
/* sys.hexversion is a 32-bit number by default, so the -1 case /* sys.hexversion is a 32-bit number by default, so the -1 case
* should only occur in unusual circumstances (e.g. if sys.hexversion * should only occur in unusual circumstances (e.g. if sys.hexversion
* is manually set to an invalid value). */ * is manually set to an invalid value). */
if ((hexversion == -1) || (hexversion >> 16 != PY_VERSION_HEX >> 16)) { if ((hexversion == -1) || (hexversion >> 16 != PY_VERSION_HEX >> 16)) {
PyErr_Format(PyExc_ImportError, PyErr_Format(PyExc_ImportError,
"%s: The Mercurial extension " "%s: The Mercurial extension "
"modules were compiled with Python " PY_VERSION "modules were compiled with Python " PY_VERSION