Fixed CachedProperty.kwargs being shared.

Author: jordanbriere

src/core/modules/core/core_cache.cpp

@@ -36,7 +36,7 @@
 //-----------------------------------------------------------------------------
 CCachedProperty::CCachedProperty(
 	object fget=object(), object fset=object(), object fdel=object(), object doc=object(),
-	bool unbound=false, boost::python::tuple args=boost::python::tuple(), dict kwargs=dict())
+	bool unbound=false, boost::python::tuple args=boost::python::tuple(), object kwargs=object())
 {
 	set_getter(fget);
 	set_setter(fset);
@@ -46,7 +46,11 @@ CCachedProperty::CCachedProperty(
 	m_bUnbound = unbound;
 
 	m_args = args;
-	m_kwargs = kwargs;
+
+	if (!kwargs.is_none())
+		m_kwargs = extract<dict>(kwargs);
+	else
+		m_kwargs = dict();
 }
 
 
@@ -335,7 +339,7 @@ void CCachedProperty::__setitem__(str item, object value)
 
 CCachedProperty *CCachedProperty::wrap_descriptor(
 	object descriptor, object owner, str name,
-	bool unbound, boost::python::tuple args, dict kwargs)
+	bool unbound, boost::python::tuple args, object kwargs)
 {
 	CCachedProperty *pProperty = new CCachedProperty(
 		descriptor.attr("__get__"), descriptor.attr("__set__"), descriptor.attr("__delete__"),

src/core/modules/core/core_cache.h

@@ -42,7 +42,7 @@ class CCachedProperty
 public:
 	CCachedProperty(
 		object fget, object fset, object fdel, object doc, bool unbound,
-		boost::python::tuple args, dict kwargs
+		boost::python::tuple args, object kwargs
 	);
 
 	static object _callable_check(object function, const char *szName);
@@ -77,7 +77,7 @@ class CCachedProperty
 
 	static CCachedProperty *wrap_descriptor(
 		object descriptor, object owner=object(), str name=str(),
-		bool unbound=false, boost::python::tuple args=boost::python::tuple(), dict kwargs=dict()
+		bool unbound=false, boost::python::tuple args=boost::python::tuple(), object kwargs=object()
 	);
 
 private:

src/core/modules/core/core_cache_wrap.cpp

@@ -54,10 +54,10 @@ void export_cached_property(scope _cache)
 {
 	class_<CCachedProperty, CCachedProperty *> CachedProperty(
 		"CachedProperty",
-		init<object, object, object, object, bool, boost::python::tuple, dict>(
+		init<object, object, object, object, bool, boost::python::tuple, object>(
 			(
 				arg("self"), arg("fget")=object(), arg("fset")=object(), arg("fdel")=object(), arg("doc")=object(),
-				arg("unbound")=false, arg("args")=boost::python::tuple(), arg("kwargs")=dict()
+				arg("unbound")=false, arg("args")=boost::python::tuple(), arg("kwargs")=object()
 			),
 			"Represents a property attribute that is only"
 			" computed once and cached.\n"