Switch to simpler design

Author: EthanSteinberg

include/pybind11/detail/internals.h

@@ -31,10 +31,6 @@
 #    define PYBIND11_INTERNALS_VERSION 4
 #endif
 
-#ifndef PYBIND11_LOCAL_INTERNALS_VERSION
-#    define PYBIND11_LOCAL_INTERNALS_VERSION 1
-#endif
-
 PYBIND11_NAMESPACE_BEGIN(PYBIND11_NAMESPACE)
 
 using ExceptionTranslator = void (*)(std::exception_ptr);
@@ -514,10 +510,6 @@ struct local_internals {
             = static_cast<shared_loader_life_support_data *>(ptr)->loader_life_support_tls_key;
     }
 #endif //  defined(WITH_THREAD) && PYBIND11_INTERNALS_VERSION == 4
-
-#if PYBIND11_LOCAL_INTERNALS_VERSION >= 1
-    const char *function_capsule_name = strdup("pybind11_function_capsule");
-#endif
 };
 
 /// Works like `get_internals`, but for things which are locally registered.
@@ -531,14 +523,6 @@ inline local_internals &get_local_internals() {
     return *locals;
 }
 
-inline const char *get_function_capsule_name() {
-#if PYBIND11_LOCAL_INTERNALS_VERSION >= 1
-    return get_local_internals().function_capsule_name;
-#else
-    return nullptr;
-#endif
-}
-
 /// Constructs a std::string with the given arguments, stores it in `internals`, and returns its
 /// `c_str()`.  Such strings objects have a long storage duration -- the internal strings are only
 /// cleared when the program exits or after interpreter shutdown (when embedding), and so are

include/pybind11/pybind11.h

@@ -69,9 +69,14 @@ inline bool apply_exception_translators(std::forward_list<ExceptionTranslator> &
     return false;
 }
 
+constexpr const char* function_capsule_name = "pybind11_funciton_capsule_v1";
+
 inline bool is_function_record_capsule(const capsule &cap) {
     // Compare the pointers, not the values to ensure that each extension is unique
-    return cap.name() == get_function_capsule_name();
+    if (cap.name() == nullptr) {
+        return false;
+    }
+    return (std::strcmp(cap.name(), function_capsule_name) == 0);
 }
 
 #if defined(_MSC_VER)
@@ -508,7 +513,7 @@ class cpp_function : public function {
 
             capsule rec_capsule(unique_rec.release(),
                                 [](void *ptr) { destruct((detail::function_record *) ptr); });
-            rec_capsule.set_name(detail::get_function_capsule_name());
+            rec_capsule.set_name(detail::function_capsule_name);
             guarded_strdup.release();
 
             object scope_module;
@@ -677,7 +682,7 @@ class cpp_function : public function {
 
         /* Iterator over the list of potentially admissible overloads */
         const function_record *overloads = reinterpret_cast<function_record *>(
-                                  PyCapsule_GetPointer(self, get_function_capsule_name())),
+                                  PyCapsule_GetPointer(self, function_capsule_name)),
                               *it = overloads;
         assert(overloads != nullptr);