include/pybind11/internal/kernel.h

@@ -10,7 +10,7 @@ struct capsule {
     void* ptr;
     void (*destructor)(void*);
 
-    template <typename T, typename = std::enable_if_t<!(std::is_same_v<remove_cvref_t<T>, capsule>)>>
+    template <typename T>
     capsule(T&& value) :
         ptr(new auto(std::forward<T>(value))), destructor([](void* ptr) {
             delete static_cast<std::decay_t<T>*>(ptr);
@@ -26,7 +26,7 @@ struct capsule {
     }
 
     ~capsule() {
-        if(ptr && destructor) destructor(ptr);
+        if(ptr != nullptr && destructor != nullptr) destructor(ptr);
     }
 };
 }  // namespace pybind11::impl

include/pybind11/internal/types.h

@@ -53,7 +53,7 @@ public:
     static type of() {
         return type_visitor::type<T>();
     }
-
+    
     static type of(const handle& obj) { return type(vm->_t(obj.ptr())); }
 };
 
@@ -365,9 +365,8 @@ class capsule : public object {
     PYBIND11_TYPE_IMPLEMENT(object, impl::capsule, handle(vm->builtins->attr("capsule"))._as<pkpy::Type>());
 
 public:
-    capsule(void* ptr, void (*destructor)(void*) = nullptr) : object(create(ptr, destructor)) {}
-
-    void* data() const { return self().ptr; }
+    template <typename T>
+    capsule(T&& value) : object(create(std::forward<T>(value))) {}
 
     template <typename T>
     T& cast() const {