Skip to content

Commit 9157e1b

Browse files
committed
fix merge conflict
1 parent c689b92 commit 9157e1b

File tree

1 file changed

+0
-19
lines changed

1 file changed

+0
-19
lines changed

Objects/typeobject.c

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4218,25 +4218,6 @@ _PyType_LookupId(PyTypeObject *type, _Py_Identifier *name)
42184218
return _PyType_Lookup(type, oname);
42194219
}
42204220

4221-
4222-
/* Check if the "readied" PyUnicode name
4223-
is a double-underscore special name. */
4224-
static int
4225-
is_dunder_name(PyObject *name)
4226-
{
4227-
Py_ssize_t length = PyUnicode_GET_LENGTH(name);
4228-
int kind = PyUnicode_KIND(name);
4229-
/* Special names contain at least "__x__" and are always ASCII. */
4230-
if (length > 4 && kind == PyUnicode_1BYTE_KIND) {
4231-
const Py_UCS1 *characters = PyUnicode_1BYTE_DATA(name);
4232-
return (
4233-
((characters[length-2] == '_') && (characters[length-1] == '_')) &&
4234-
((characters[0] == '_') && (characters[1] == '_'))
4235-
);
4236-
}
4237-
return 0;
4238-
}
4239-
42404221
/* This is similar to PyObject_GenericGetAttr(),
42414222
but uses _PyType_Lookup() instead of just looking in type->tp_dict. */
42424223
PyObject *

0 commit comments

Comments
 (0)