Merge branch 'master' into cached_property

Author: jordanbriere

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

@@ -10,6 +10,8 @@
 from collections import defaultdict
 #   Contextlib
 from contextlib import suppress
+#   Inspect
+from inspect import signature
 #   WeakRef
 from weakref import WeakSet
 
@@ -88,17 +90,29 @@ def __init__(cls, classname, bases, attributes):
         # New instances of this class will be cached in that dictionary
         cls._cache = {}
 
+        # Set whether or not this class is caching its instances by default
+        try:
+            cls._caching = signature(
+                cls.__init__
+            ).parameters['caching'].default
+        except KeyError:
+            cls._caching = True
+
         # Add the class to the registered classes
         _entity_classes.add(cls)
 
-    def __call__(cls, index, caching=True):
+    def __call__(cls, index, caching=None):
         """Called when a new instance of this class is requested.
 
         :param int index:
             The index of the entity instance requested.
         :param bool caching:
             Whether to lookup the cache for an existing instance or not.
         """
+        # Get whether or not we should lookup for a cached instance
+        if caching is None:
+            caching = cls._caching
+
         # Let's first lookup for a cached instance
         if caching:
             try:
@@ -122,6 +136,14 @@ def __call__(cls, index, caching=True):
         # We are done, let's return the instance
         return obj
 
+    @property
+    def caching(cls):
+        """Returns whether this class is caching its instances by default.
+
+        :rtype: bool
+        """
+        return cls._caching
+
     @property
     def cache(cls):
         """Returns the cached instances of this class.
@@ -162,6 +184,10 @@ class also provides dynamic attributes that depend on the entity that is
         .. note::
             This is not an instance property, so it can only be
             accessed through the class itself.
+
+    :var caching:
+        A read-only attribute that returns whether this class is caching its
+        instances by default.
     """
 
     def __init__(self, index, caching=True):

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

@@ -101,6 +101,16 @@ def from_userid(cls, userid):
         """
         return cls(index_from_userid(userid))
 
+    @cached_property
+    def net_info(self):
+        """Return the player's network channel information.
+        :return:
+            ``None`` if no network channel information exists. E. g. if the
+            player is a bot.
+        :rtype: NetChannelInfo
+        """
+        return engine_server.get_player_net_info(self.index)
+
     @cached_property
     def raw_steamid(self):
         """Return the player's unformatted SteamID.