Merge branch 'main' into try-find-rename

Author: tfpf

src/pysorteddict/sorted_dict_type.cc

@@ -62,6 +62,51 @@ static PyTypeObject* PyWindowsPath_Type;
 static PyTypeObject* PyStructTime_Type;
 static PyTypeObject* PyUUID_Type;
 
+/**
+ * Try to set the key type of the sorted dictionary. It should not already be
+ * set. The provided argument should not be a null pointer.
+ *
+ * @param key_type Key type.
+ *
+ * @return `true` if successful, else `false`.
+ */
+bool SortedDictType::try_set_key_type(PyObject* key_type)
+{
+    static PyTypeObject* allowed_key_types[] = {
+        &PyBool_Type,
+        &PyBytes_Type,
+        &PyFloat_Type,
+        &PyLong_Type,
+        &PyUnicode_Type,
+        // The following types are not built-in.
+        PyDate_Type = import_python_type("datetime", "date"),
+        PyTimeDelta_Type = import_python_type("datetime", "timedelta"),
+        PyDecimal_Type = import_python_type("decimal", "Decimal"),
+        PyFraction_Type = import_python_type("fractions", "Fraction"),
+        PyIPv4Address_Type = import_python_type("ipaddress", "IPv4Address"),
+        PyIPv4Interface_Type = import_python_type("ipaddress", "IPv4Interface"),
+        PyIPv4Network_Type = import_python_type("ipaddress", "IPv4Network"),
+        PyIPv6Address_Type = import_python_type("ipaddress", "IPv6Address"),
+        PyIPv6Interface_Type = import_python_type("ipaddress", "IPv6Interface"),
+        PyIPv6Network_Type = import_python_type("ipaddress", "IPv6Network"),
+        PyPosixPath_Type = import_python_type("pathlib", "PosixPath"),
+        PyPurePosixPath_Type = import_python_type("pathlib", "PurePosixPath"),
+        PyPureWindowsPath_Type = import_python_type("pathlib", "PureWindowsPath"),
+        PyWindowsPath_Type = import_python_type("pathlib", "WindowsPath"),
+        PyStructTime_Type = import_python_type("time", "struct_time"),
+        PyUUID_Type = import_python_type("uuid", "UUID"),
+    };
+    for (PyTypeObject* allowed_key_type : allowed_key_types)
+    {
+        if (allowed_key_type != nullptr && Py_Is(key_type, reinterpret_cast<PyObject*>(allowed_key_type)))
+        {
+            this->key_type = allowed_key_type;
+            return true;
+        }
+    }
+    return false;
+}
+
 /**
  * Check whether the given key can be inserted into this sorted dictionary. For
  * instance, NaN cannot be compared with other floating-point numbers, so it
@@ -125,8 +170,10 @@ bool SortedDictType::are_key_type_and_key_value_pair_good(PyObject* key, PyObjec
         }
 
         // The first key-value pair is being inserted.
-        if (this->set_key_type(reinterpret_cast<PyObject*>(Py_TYPE(key)), key) == -1)
+        PyObject* key_type = reinterpret_cast<PyObject*>(Py_TYPE(key));
+        if (!this->try_set_key_type(key_type))
         {
+            PyErr_Format(PyExc_TypeError, "got key %R of unsupported type %R", key, key_type);
             return false;
         }
         key_type_set_here = true;
@@ -637,7 +684,7 @@ PyObject* SortedDictType::get_key_type(void)
     return Py_NewRef(this->key_type);  // 🆕
 }
 
-int SortedDictType::set_key_type(PyObject* key_type, PyObject* key)
+int SortedDictType::set_key_type(PyObject* key_type)
 {
     if (key_type == nullptr)
     {
@@ -655,51 +702,12 @@ int SortedDictType::set_key_type(PyObject* key_type, PyObject* key)
         return -1;
     }
 
-    static PyTypeObject* allowed_key_types[] = {
-        &PyBool_Type,
-        &PyBytes_Type,
-        &PyFloat_Type,
-        &PyLong_Type,
-        &PyUnicode_Type,
-        // The following types are not built-in.
-        PyDate_Type = import_python_type("datetime", "date"),
-        PyTimeDelta_Type = import_python_type("datetime", "timedelta"),
-        PyDecimal_Type = import_python_type("decimal", "Decimal"),
-        PyFraction_Type = import_python_type("fractions", "Fraction"),
-        PyIPv4Address_Type = import_python_type("ipaddress", "IPv4Address"),
-        PyIPv4Interface_Type = import_python_type("ipaddress", "IPv4Interface"),
-        PyIPv4Network_Type = import_python_type("ipaddress", "IPv4Network"),
-        PyIPv6Address_Type = import_python_type("ipaddress", "IPv6Address"),
-        PyIPv6Interface_Type = import_python_type("ipaddress", "IPv6Interface"),
-        PyIPv6Network_Type = import_python_type("ipaddress", "IPv6Network"),
-        PyPosixPath_Type = import_python_type("pathlib", "PosixPath"),
-        PyPurePosixPath_Type = import_python_type("pathlib", "PurePosixPath"),
-        PyPureWindowsPath_Type = import_python_type("pathlib", "PureWindowsPath"),
-        PyWindowsPath_Type = import_python_type("pathlib", "WindowsPath"),
-        PyStructTime_Type = import_python_type("time", "struct_time"),
-        PyUUID_Type = import_python_type("uuid", "UUID"),
-    };
-    for (PyTypeObject* allowed_key_type : allowed_key_types)
+    if (!this->try_set_key_type(key_type))
     {
-        if (allowed_key_type != nullptr && Py_Is(key_type, reinterpret_cast<PyObject*>(allowed_key_type)))
-        {
-            this->key_type = allowed_key_type;
-            return 0;
-        }
-    }
-
-    if (key != nullptr)
-    {
-        // The user supplied a key of the wrong type.
-        PyErr_Format(PyExc_TypeError, "got key %R of unsupported type %R", key, key_type);
-    }
-    else
-    {
-        // The user supplied a wrong value (which should have been a supported
-        // type).
         PyErr_Format(PyExc_ValueError, "got %R, want a supported key type", key_type);
+        return -1;
     }
-    return -1;
+    return 0;
 }
 
 int SortedDictType::init(PyObject* args, PyObject* kwargs)

src/pysorteddict/sorted_dict_type.hh

@@ -63,6 +63,7 @@ private:
     Py_ssize_t known_referrers;
 
 private:
+    bool try_set_key_type(PyObject*);
     bool is_key_good(PyObject*);
     bool are_key_type_and_key_value_pair_good(PyObject*, PyObject* value = nullptr);
     bool is_deletion_allowed(void);
@@ -93,7 +94,7 @@ public:
     PyObject* update(PyObject* const*, Py_ssize_t, PyObject*);
     PyObject* values(PyTypeObject*);
     PyObject* get_key_type(void);
-    int set_key_type(PyObject*, PyObject* key = nullptr);
+    int set_key_type(PyObject*);
     int init(PyObject*, PyObject*);
     static PyObject* New(PyTypeObject*, PyObject*, PyObject*);