Skip to content

Commit 926ff69

Browse files
authored
gh-132825: Fix typo in dict_unhashable_type() name (#132847)
1 parent 426449d commit 926ff69

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

Objects/dictobject.c

+13-13
Original file line numberDiff line numberDiff line change
@@ -2277,7 +2277,7 @@ PyDict_GetItem(PyObject *op, PyObject *key)
22772277
}
22782278

22792279
static void
2280-
dict_unhashtable_type(PyObject *key)
2280+
dict_unhashable_type(PyObject *key)
22812281
{
22822282
PyObject *exc = PyErr_GetRaisedException();
22832283
assert(exc != NULL);
@@ -2302,7 +2302,7 @@ _PyDict_LookupIndex(PyDictObject *mp, PyObject *key)
23022302

23032303
Py_hash_t hash = _PyObject_HashFast(key);
23042304
if (hash == -1) {
2305-
dict_unhashtable_type(key);
2305+
dict_unhashable_type(key);
23062306
return -1;
23072307
}
23082308

@@ -2399,7 +2399,7 @@ PyDict_GetItemRef(PyObject *op, PyObject *key, PyObject **result)
23992399

24002400
Py_hash_t hash = _PyObject_HashFast(key);
24012401
if (hash == -1) {
2402-
dict_unhashtable_type(key);
2402+
dict_unhashable_type(key);
24032403
*result = NULL;
24042404
return -1;
24052405
}
@@ -2415,7 +2415,7 @@ _PyDict_GetItemRef_Unicode_LockHeld(PyDictObject *op, PyObject *key, PyObject **
24152415

24162416
Py_hash_t hash = _PyObject_HashFast(key);
24172417
if (hash == -1) {
2418-
dict_unhashtable_type(key);
2418+
dict_unhashable_type(key);
24192419
*result = NULL;
24202420
return -1;
24212421
}
@@ -2453,7 +2453,7 @@ PyDict_GetItemWithError(PyObject *op, PyObject *key)
24532453
}
24542454
hash = _PyObject_HashFast(key);
24552455
if (hash == -1) {
2456-
dict_unhashtable_type(key);
2456+
dict_unhashable_type(key);
24572457
return NULL;
24582458
}
24592459

@@ -2611,7 +2611,7 @@ setitem_take2_lock_held(PyDictObject *mp, PyObject *key, PyObject *value)
26112611
assert(PyDict_Check(mp));
26122612
Py_hash_t hash = _PyObject_HashFast(key);
26132613
if (hash == -1) {
2614-
dict_unhashtable_type(key);
2614+
dict_unhashable_type(key);
26152615
Py_DECREF(key);
26162616
Py_DECREF(value);
26172617
return -1;
@@ -2763,7 +2763,7 @@ PyDict_DelItem(PyObject *op, PyObject *key)
27632763
assert(key);
27642764
Py_hash_t hash = _PyObject_HashFast(key);
27652765
if (hash == -1) {
2766-
dict_unhashtable_type(key);
2766+
dict_unhashable_type(key);
27672767
return -1;
27682768
}
27692769

@@ -3086,7 +3086,7 @@ pop_lock_held(PyObject *op, PyObject *key, PyObject **result)
30863086

30873087
Py_hash_t hash = _PyObject_HashFast(key);
30883088
if (hash == -1) {
3089-
dict_unhashtable_type(key);
3089+
dict_unhashable_type(key);
30903090
if (result) {
30913091
*result = NULL;
30923092
}
@@ -3421,7 +3421,7 @@ dict_subscript(PyObject *self, PyObject *key)
34213421

34223422
hash = _PyObject_HashFast(key);
34233423
if (hash == -1) {
3424-
dict_unhashtable_type(key);
3424+
dict_unhashable_type(key);
34253425
return NULL;
34263426
}
34273427
ix = _Py_dict_lookup_threadsafe(mp, key, hash, &value);
@@ -4302,7 +4302,7 @@ dict_get_impl(PyDictObject *self, PyObject *key, PyObject *default_value)
43024302

43034303
hash = _PyObject_HashFast(key);
43044304
if (hash == -1) {
4305-
dict_unhashtable_type(key);
4305+
dict_unhashable_type(key);
43064306
return NULL;
43074307
}
43084308
ix = _Py_dict_lookup_threadsafe(self, key, hash, &val);
@@ -4335,7 +4335,7 @@ dict_setdefault_ref_lock_held(PyObject *d, PyObject *key, PyObject *default_valu
43354335

43364336
hash = _PyObject_HashFast(key);
43374337
if (hash == -1) {
4338-
dict_unhashtable_type(key);
4338+
dict_unhashable_type(key);
43394339
if (result) {
43404340
*result = NULL;
43414341
}
@@ -4764,7 +4764,7 @@ PyDict_Contains(PyObject *op, PyObject *key)
47644764
{
47654765
Py_hash_t hash = _PyObject_HashFast(key);
47664766
if (hash == -1) {
4767-
dict_unhashtable_type(key);
4767+
dict_unhashable_type(key);
47684768
return -1;
47694769
}
47704770

@@ -6855,7 +6855,7 @@ _PyDict_SetItem_LockHeld(PyDictObject *dict, PyObject *name, PyObject *value)
68556855
if (value == NULL) {
68566856
Py_hash_t hash = _PyObject_HashFast(name);
68576857
if (hash == -1) {
6858-
dict_unhashtable_type(name);
6858+
dict_unhashable_type(name);
68596859
return -1;
68606860
}
68616861
return delitem_knownhash_lock_held((PyObject *)dict, name, hash);

Objects/setobject.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ set_add_entry(PySetObject *so, PyObject *key, Py_hash_t hash)
212212
}
213213

214214
static void
215-
set_unhashtable_type(PyObject *key)
215+
set_unhashable_type(PyObject *key)
216216
{
217217
PyObject *exc = PyErr_GetRaisedException();
218218
assert(exc != NULL);
@@ -232,7 +232,7 @@ _PySet_AddTakeRef(PySetObject *so, PyObject *key)
232232
{
233233
Py_hash_t hash = _PyObject_HashFast(key);
234234
if (hash == -1) {
235-
set_unhashtable_type(key);
235+
set_unhashable_type(key);
236236
Py_DECREF(key);
237237
return -1;
238238
}
@@ -401,7 +401,7 @@ set_add_key(PySetObject *so, PyObject *key)
401401
{
402402
Py_hash_t hash = _PyObject_HashFast(key);
403403
if (hash == -1) {
404-
set_unhashtable_type(key);
404+
set_unhashable_type(key);
405405
return -1;
406406
}
407407
return set_add_entry(so, key, hash);
@@ -412,7 +412,7 @@ set_contains_key(PySetObject *so, PyObject *key)
412412
{
413413
Py_hash_t hash = _PyObject_HashFast(key);
414414
if (hash == -1) {
415-
set_unhashtable_type(key);
415+
set_unhashable_type(key);
416416
return -1;
417417
}
418418
return set_contains_entry(so, key, hash);
@@ -423,7 +423,7 @@ set_discard_key(PySetObject *so, PyObject *key)
423423
{
424424
Py_hash_t hash = _PyObject_HashFast(key);
425425
if (hash == -1) {
426-
set_unhashtable_type(key);
426+
set_unhashable_type(key);
427427
return -1;
428428
}
429429
return set_discard_entry(so, key, hash);

0 commit comments

Comments
 (0)