Commite510a7b

and

authored

Make PyUnstable_Unicode_GET_CACHED_HASH return -1 on PyPy (#157)

Co-authored-by: Victor Stinner <vstinner@python.org>

1 parent6c77b6b commite510a7bCopy full SHA for e510a7b

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ Python 3.15`
`68`	`68`
`69`	`69`	See `PyUnstable_Unicode_GET_CACHED_HASH() documentation <https://docs.python.org/dev/c-api/unicode.html#c.PyUnstable_Unicode_GET_CACHED_HASH>`__.
`70`	`70`
`71`		`-Not available on PyPy.`
	`71`	+On PyPy, always returns ``-1``.
`72`	`72`
`73`	`73`
`74`	`74`	`Python 3.14`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2572,11 +2572,14 @@ PyTuple_FromArray(PyObject const array, Py_ssize_t size)`
`2572`	`2572`	`#endif`
`2573`	`2573`
`2574`	`2574`
`2575`		`-#if PY_VERSION_HEX < 0x030F00A1 && !defined(PYPY_VERSION)`
	`2575`	`+#if PY_VERSION_HEX < 0x030F00A1`
`2576`	`2576`	`staticinline Py_hash_t`
`2577`	`2577`	`PyUnstable_Unicode_GET_CACHED_HASH(PyObject *op)`
`2578`	`2578`	`{`
`2579`		`-#if PY_VERSION_HEX >= 0x03000000`
	`2579`	`+#ifdef PYPY_VERSION`
	`2580`	`+ (void)op;// unused argument`
	`2581`	`+return -1;`
	`2582`	`+#elif PY_VERSION_HEX >= 0x03000000`
`2580`	`2583`	`return ((PyASCIIObject*)op)->hash;`
`2581`	`2584`	`#else`
`2582`	`2585`	`return ((PyUnicodeObject*)op)->hash;`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1611,8 +1611,10 @@ test_unicode(PyObject Py_UNUSED(module), PyObject Py_UNUSED(args))`
`1611`	`1611`	`assert(PyErr_ExceptionMatches(PyExc_TypeError));`
`1612`	`1612`	`PyErr_Clear();`
`1613`	`1613`
`1614`		`-#ifndefPYPY_VERSION`
`1615`	`1614`	`// Test PyUnstable_Unicode_GET_CACHED_HASH()`
	`1615`	`+#ifdefPYPY_VERSION`
	`1616`	`+assert(PyUnstable_Unicode_GET_CACHED_HASH(abc)==-1);`
	`1617`	`+#else`
`1616`	`1618`	`Py_hash_thash=PyObject_Hash(abc);`
`1617`	`1619`	`assert(hash!=-1);`
`1618`	`1620`	`assert(PyUnstable_Unicode_GET_CACHED_HASH(abc)==hash);`

Comments

(0)