Added CachedProperty.delete_cached_value.

Author: jordanbriere

src/core/modules/core/core_cache.cpp

@@ -111,31 +111,6 @@ void CCachedProperty::_invalidate_cache(PyObject *pRef)
 	}
 }
 
-void CCachedProperty::_delete_cache(object instance)
-{
-	try
-	{
-		if (m_bUnbound)
-			m_cache[
-				handle<>(
-					PyWeakref_NewRef(instance.ptr(), NULL)
-				)
-			].del();
-		else
-		{
-			dict cache = extract<dict>(instance.attr("__dict__"));
-			cache[m_name].del();
-		}
-	}
-	catch (...)
-	{
-		if (!PyErr_ExceptionMatches(PyExc_KeyError))
-			throw_error_already_set();
-
-		PyErr_Clear();
-	}
-}
-
 
 object CCachedProperty::get_getter()
 {
@@ -235,6 +210,31 @@ void CCachedProperty::set_cached_value(object instance, object value)
 	}
 }
 
+void CCachedProperty::delete_cached_value(object instance)
+{
+	try
+	{
+		if (m_bUnbound)
+			m_cache[
+				handle<>(
+					PyWeakref_NewRef(instance.ptr(), NULL)
+				)
+			].del();
+		else
+		{
+			dict cache = extract<dict>(instance.attr("__dict__"));
+			cache[m_name].del();
+		}
+	}
+	catch (...)
+	{
+		if (!PyErr_ExceptionMatches(PyExc_KeyError))
+			throw_error_already_set();
+
+		PyErr_Clear();
+	}
+}
+
 
 object CCachedProperty::bind(object self, object owner, str name)
 {
@@ -315,7 +315,7 @@ void CCachedProperty::__set__(object instance, object value)
 	if (!result.is_none())
 		set_cached_value(instance, result);
 	else
-		_delete_cache(instance);
+		delete_cached_value(instance);
 }
 
 void CCachedProperty::__delete__(object instance)
@@ -326,7 +326,7 @@ void CCachedProperty::__delete__(object instance)
 			**m_kwargs
 		);
 
-	_delete_cache(instance);
+	delete_cached_value(instance);
 }
 
 object CCachedProperty::__call__(object self, object fget)

src/core/modules/core/core_cache.h

@@ -48,7 +48,6 @@ class CCachedProperty
 	static object _callable_check(object function, const char *szName);
 	static object _prepare_value(object value);
 	void _invalidate_cache(PyObject *pRef);
-	void _delete_cache(object instance);
 
 	object get_getter();
 	object set_getter(object fget);
@@ -64,6 +63,7 @@ class CCachedProperty
 
 	object get_cached_value(object instance);
 	void set_cached_value(object instance, object value);
+	void delete_cached_value(object instance);
 
 	static object bind(object self, object owner, str name);
 

src/core/modules/core/core_cache_wrap.cpp

@@ -377,10 +377,20 @@ void export_cached_property(scope _cache)
 		":param object instance:\n"
 		"	The instance to set the cached value for.\n"
 		":param object value:\n"
-		"	The value to set as cached value.\n",
+		"	The value to set as cached value.",
 		args("self", "instance", "value")
 	);
 
+	CachedProperty.def(
+		"delete_cached_value",
+		&CCachedProperty::delete_cached_value,
+		"Deletes the cached value for the given instance.\n"
+		"\n"
+		":param object instance:\n"
+		"	The instance to delete the cached value for.",
+		args("self", "instance")
+	);
+
 	CachedProperty.def(
 		"bind",
 		&CCachedProperty::bind,