This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2695

osutil: implement minimal __getitem__ compatibility on our custom listdir type
ClosedPublic

Authored by durin42 on Mar 5 2018, 4:08 PM.

Details

Reviewers
indygreg
yuja
Group Reviewers
hg-reviewers
Commits
rHGf3c314020beb: osutil: implement minimal __getitem__ compatibility on our custom listdir type
Summary

We previously declined to do this, but the removal of the deprecated
os.stat_float_times() method in Python 3.7 forces our hand.

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

durin42 created this revision.Mar 5 2018, 4:08 PM
indygreg requested changes to this revision.Mar 5 2018, 7:02 PM
indygreg added a subscriber: indygreg.
indygreg added inline comments.
mercurial/cext/osutil.c
130

I think this should be PyExc_IndexError.

This revision now requires changes to proceed.Mar 5 2018, 7:02 PM
mharbison72 added a subscriber: mharbison72.Mar 6 2018, 9:31 AM
mharbison72 added inline comments.
mercurial/cext/osutil.c
130

s/suport/support/

durin42 marked 2 inline comments as done.Mar 6 2018, 1:57 PM
durin42 updated this revision to Diff 6675.Mar 6 2018, 1:58 PM
durin42 updated this revision to Diff 6678.Mar 6 2018, 2:02 PM
yuja accepted this revision.Mar 8 2018, 7:57 AM
Closed by commit rHGf3c314020beb: osutil: implement minimal __getitem__ compatibility on our custom listdir type (authored by durin42). · Explain WhyMar 8 2018, 8:06 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cext/osutil.c (25 lines)
Mmercurial/policy.py (2 lines)

Diff 6727

mercurial/cext/osutil.c

return t->tp_alloc(t, 0); return t->tp_alloc(t, 0);
} }
static void listdir_stat_dealloc(PyObject *o) static void listdir_stat_dealloc(PyObject *o)
{ {
o->ob_type->tp_free(o); o->ob_type->tp_free(o);
} }
static PyObject *listdir_stat_getitem(PyObject *self, PyObject *key)
{
long index = PyLong_AsLong(key);
if (index == -1 && PyErr_Occurred()) {
return NULL;
}
if (index != 8) {
indygregUnsubmitted
Done

I think this should be PyExc_IndexError.

indygreg: I think this should be `PyExc_IndexError`.
mharbison72Unsubmitted
Done

s/suport/support/

mharbison72: s/suport/support/
PyErr_Format(PyExc_IndexError, "osutil.stat objects only "
"support stat.ST_MTIME in "
"__getitem__");
return NULL;
}
return listdir_stat_st_mtime(self, NULL);
}
static PyMappingMethods listdir_stat_type_mapping_methods = {
(lenfunc)NULL, /* mp_length */
(binaryfunc)listdir_stat_getitem, /* mp_subscript */
(objobjargproc)NULL, /* mp_ass_subscript */
};
static PyTypeObject listdir_stat_type = { static PyTypeObject listdir_stat_type = {
PyVarObject_HEAD_INIT(NULL, 0) /* header */ PyVarObject_HEAD_INIT(NULL, 0) /* header */
"osutil.stat", /*tp_name*/ "osutil.stat", /*tp_name*/
sizeof(struct listdir_stat), /*tp_basicsize*/ sizeof(struct listdir_stat), /*tp_basicsize*/
0, /*tp_itemsize*/ 0, /*tp_itemsize*/
(destructor)listdir_stat_dealloc, /*tp_dealloc*/ (destructor)listdir_stat_dealloc, /*tp_dealloc*/
0, /*tp_print*/ 0, /*tp_print*/
0, /*tp_getattr*/ 0, /*tp_getattr*/
0, /*tp_setattr*/ 0, /*tp_setattr*/
0, /*tp_compare*/ 0, /*tp_compare*/
0, /*tp_repr*/ 0, /*tp_repr*/
0, /*tp_as_number*/ 0, /*tp_as_number*/
0, /*tp_as_sequence*/ 0, /*tp_as_sequence*/
0, /*tp_as_mapping*/ &listdir_stat_type_mapping_methods, /*tp_as_mapping*/
0, /*tp_hash */ 0, /*tp_hash */
0, /*tp_call*/ 0, /*tp_call*/
0, /*tp_str*/ 0, /*tp_str*/
0, /*tp_getattro*/ 0, /*tp_getattro*/
0, /*tp_setattro*/ 0, /*tp_setattro*/
0, /*tp_as_buffer*/ 0, /*tp_as_buffer*/
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
"stat objects", /* tp_doc */ "stat objects", /* tp_doc */
{ {
"isgui", (PyCFunction)isgui, METH_NOARGS, "isgui", (PyCFunction)isgui, METH_NOARGS,
"Is a CoreGraphics session available?" "Is a CoreGraphics session available?"
}, },
#endif #endif
{NULL, NULL} {NULL, NULL}
}; };
static const int version = 3; static const int version = 4;
#ifdef IS_PY3K #ifdef IS_PY3K
static struct PyModuleDef osutil_module = { static struct PyModuleDef osutil_module = {
PyModuleDef_HEAD_INIT, PyModuleDef_HEAD_INIT,
"osutil", "osutil",
osutil_doc, osutil_doc,
-1, -1,
methods methods

mercurial/policy.py

return fakelocals[modname] return fakelocals[modname]
# keep in sync with "version" in C modules # keep in sync with "version" in C modules
_cextversions = { _cextversions = {
(r'cext', r'base85'): 1, (r'cext', r'base85'): 1,
(r'cext', r'bdiff'): 3, (r'cext', r'bdiff'): 3,
(r'cext', r'diffhelpers'): 1, (r'cext', r'diffhelpers'): 1,
(r'cext', r'mpatch'): 1, (r'cext', r'mpatch'): 1,
(r'cext', r'osutil'): 3, (r'cext', r'osutil'): 4,
(r'cext', r'parsers'): 4, (r'cext', r'parsers'): 4,
} }
# map import request to other package or module # map import request to other package or module
_modredirects = { _modredirects = {
(r'cext', r'charencode'): (r'cext', r'parsers'), (r'cext', r'charencode'): (r'cext', r'parsers'),
(r'cffi', r'base85'): (r'pure', r'base85'), (r'cffi', r'base85'): (r'pure', r'base85'),
(r'cffi', r'charencode'): (r'pure', r'charencode'), (r'cffi', r'charencode'): (r'pure', r'charencode'),