Removed a redundant layer to get Entity.index.

Removed some redundant extractions to get/set CachedProperty.__doc__.
Fixed some docstrings.

Author: jordanbriere

addons/source-python/packages/source-python/core/cache.py

@@ -8,14 +8,18 @@
 
 
 # =============================================================================
-# >> FORWARD IMPORTS
+# >> IMPORTS
 # =============================================================================
 # Python Imports
 #   FuncTools
 from functools import wraps
 #   Types
 from types import MethodType
 
+
+# =============================================================================
+# >> FORWARD IMPORTS
+# =============================================================================
 # Source.Python Imports
 #   Core
 from _core._cache import CachedProperty

addons/source-python/packages/source-python/entities/_base.py

@@ -199,10 +199,10 @@ def __init__(self, index, caching=True):
         super().__init__(index)
 
         # Set the entity's base attributes
-        object.__setattr__(self, '_index', index)
+        vars(self)['index'] = index
 
     def __hash__(self):
-        """Return a hash value based on the entity index."""
+        """Return a hash value based on the entity inthandle."""
         # Required for sets, because we have implemented __eq__
         return hash(self.inthandle)
 
@@ -231,7 +231,7 @@ def __getattr__(self, attr):
         raise AttributeError('Attribute "{0}" not found'.format(attr))
 
     def __setattr__(self, attr, value):
-        """Find if the attribute is value and sets its value."""
+        """Find if the attribute is valid and sets its value."""
         # Is the given attribute a property?
         if (attr in super().__dir__() and isinstance(
                 getattr(self.__class__, attr, None), property)):
@@ -299,14 +299,6 @@ def is_networked(self):
         """
         return True
 
-    @cached_property
-    def index(self):
-        """Return the entity's index.
-
-        :rtype: int
-        """
-        return self._index
-
     @property
     def owner(self):
         """Return the entity's owner.

src/core/modules/core/core_cache.cpp

@@ -35,14 +35,14 @@
 // CCachedProperty class.
 //-----------------------------------------------------------------------------
 CCachedProperty::CCachedProperty(
-	object fget=object(), object fset=object(), object fdel=object(), const char *doc=NULL,
+	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())
 {
 	set_getter(fget);
 	set_setter(fset);
 	set_deleter(fdel);
 
-	m_szDocString = doc;
+	m_doc = doc;
 	m_bUnbound = unbound;
 
 	m_args = args;
@@ -317,7 +317,7 @@ CCachedProperty *CCachedProperty::wrap_descriptor(
 {
 	CCachedProperty *pProperty = new CCachedProperty(
 		descriptor.attr("__get__"), descriptor.attr("__set__"), descriptor.attr("__delete__"),
-		extract<const char *>(descriptor.attr("__doc__")), unbound, args, kwargs
+		descriptor.attr("__doc__"), unbound, args, kwargs
 	);
 
 	pProperty->__set_name__(owner, name);

src/core/modules/core/core_cache.h

@@ -41,7 +41,7 @@ class CCachedProperty
 {
 public:
 	CCachedProperty(
-		object fget, object fset, object fdel, const char *doc, bool unbound,
+		object fget, object fset, object fdel, object doc, bool unbound,
 		boost::python::tuple args, dict kwargs
 	);
 
@@ -88,7 +88,7 @@ class CCachedProperty
 	dict m_cache;
 
 public:
-	const char *m_szDocString;
+	object m_doc;
 
 	boost::python::tuple m_args;
 	dict m_kwargs;

src/core/modules/core/core_cache_wrap.cpp

@@ -54,7 +54,7 @@ void export_cached_property(scope _cache)
 {
 	class_<CCachedProperty, CCachedProperty *> CachedProperty(
 		"CachedProperty",
-		init<object, object, object, const char *, bool, boost::python::tuple, dict>(
+		init<object, object, object, object, bool, boost::python::tuple, dict>(
 			(
 				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()
@@ -216,7 +216,7 @@ void export_cached_property(scope _cache)
 
 	CachedProperty.def_readwrite(
 		"__doc__",
-		&CCachedProperty::m_szDocString,
+		&CCachedProperty::m_doc,
 		"Documentation string for this property.\n"
 		"\n"
 		":rtype:\n"