Fix error from PythonProxyObject with PyBind11 update to 2.7.1 that r…

…esults in an 'unhashable type' for PythonProxyObject. (See pybind/pybind11#2291 ) Signed-off-by: Steve Pham <[email protected]>
aws-lumberyard-dev · Jul 18, 2022 · c154561 · c154561
1 parent 30f9001
commit c154561
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/Gems/EditorPythonBindings/Code/Source/PythonProxyObject.cpp b/Gems/EditorPythonBindings/Code/Source/PythonProxyObject.cpp
@@ -527,6 +527,12 @@ namespace EditorPythonBindings
  return GetWrappedObjectRepr();
  }
 
+ pybind11::ssize_t PythonProxyObject::GetWrappedObjectHash()
+ {
+ pybind11::object result = GetWrappedObjectRepr(); 
+ return pybind11::hash(result.release());
+ }
+
  void PythonProxyObject::ReleaseWrappedObject()
  {
  if (m_wrappedObject.IsValid() && m_ownership == Ownership::Owned)
@@ -976,6 +982,7 @@ namespace EditorPythonBindings
  })
  .def("__setattr__", &PythonProxyObject::SetPropertyValue)
  .def("__getattr__", &PythonProxyObject::GetPropertyValue)
+ .def("__hash__", &PythonProxyObject::GetWrappedObjectHash)
  .def(Builtins::s_repr, [](PythonProxyObject& self)
  {
  return self.GetWrappedObjectRepr();

diff --git a/Gems/EditorPythonBindings/Code/Source/PythonProxyObject.h b/Gems/EditorPythonBindings/Code/Source/PythonProxyObject.h
@@ -76,6 +76,10 @@ namespace EditorPythonBindings
  //! Gets the wrapped object's __str__
  pybind11::object GetWrappedObjectStr();
 
+ //! Gets the wrapped object's __hash__
+ pybind11::ssize_t GetWrappedObjectHash();
+
+
  protected:
  void PrepareWrappedObject(const AZ::BehaviorClass& behaviorClass);
  void ReleaseWrappedObject();