Added CachedProperty.bind.

Author: jordanbriere

addons/source-python/packages/source-python/__init__.py

@@ -156,7 +156,7 @@ def setup_data():
     from core.cache import CachedProperty
     from memory import get_function_info
     from memory.helpers import MemberFunction
-    players.BaseClient.fire_game_event = CachedProperty(
+    CachedProperty(
         lambda self, info: MemberFunction(
             manager,
             info.return_type,
@@ -169,10 +169,7 @@ def setup_data():
             The game event instance to fire.
         """,
         args=(get_function_info('IGameEventListener2', 'FireGameEvent'),)
-    )
-    players.BaseClient.fire_game_event.__set_name__(
-        players.BaseClient, 'fire_game_event'
-    )
+    ).bind(players.BaseClient, 'fire_game_event')
 
     import entities
     entities._BaseEntityOutput = manager.create_type_from_dict(

src/core/modules/core/core_cache.cpp

@@ -232,6 +232,15 @@ void CCachedProperty::set_cached_value(object instance, object value)
 }
 
 
+object CCachedProperty::bind(object self, object owner, str name)
+{
+	CCachedProperty &pSelf = extract<CCachedProperty &>(self);
+	owner.attr(name) = self;
+	pSelf.__set_name__(owner, name);
+	return self;
+}
+
+
 void CCachedProperty::__set_name__(object owner, str name)
 {
 	m_name = name;

src/core/modules/core/core_cache.h

@@ -65,6 +65,8 @@ class CCachedProperty
 	object get_cached_value(object instance);
 	void set_cached_value(object instance, object value);
 
+	static object bind(object self, object owner, str name);
+
 	void __set_name__(object owner, str name);
 	static object __get__(object self, object instance, object owner);
 	void __set__(object instance, object value);

src/core/modules/core/core_cache_wrap.cpp

@@ -378,6 +378,21 @@ void export_cached_property(scope _cache)
 		args("self", "instance", "value")
 	);
 
+	CachedProperty.def(
+		"bind",
+		&CCachedProperty::bind,
+		"Binds this property to the given class as the given name.\n"
+		"\n"
+		":param class owner:\n"
+		"	The class the wrapped property should be bound to.\n"
+		":param str name:\n"
+		"	The name of this property.\n"
+		"\n"
+		":rtype:\n"
+		"	CachedProperty",
+		args("self", "owner", "name")
+	);
+
 	CachedProperty.def(
 		"wrap_descriptor",
 		&CCachedProperty::wrap_descriptor,