Merge branch 'Source-Python-Dev-Team:master' into master

Author: srpg

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

@@ -68,10 +68,6 @@ def new_open(f, *args, **kwargs):
 # =============================================================================
 # >> IMPORTS
 # =============================================================================
-# Python Imports
-#   Context
-from contextlib import suppress
-
 # Source.Python Imports
 #   Loggers
 from loggers import _sp_logger  # It's save to import this here
@@ -428,9 +424,11 @@ def remove_entities_listener():
     from _core import _sp_plugin
     from memory.manager import manager
 
-    with suppress(NameError):
+    try:
         manager.get_global_pointer('GlobalEntityList').remove_entity_listener(
             _sp_plugin)
+    except NameError:
+        pass
 
 
 # =============================================================================

addons/source-python/packages/source-python/commands/typed.py

@@ -7,8 +7,6 @@
 # >> IMPORTS
 # =============================================================================
 # Python Imports
-#   Contextlib
-from contextlib import suppress
 #   Inspect
 import inspect
 from inspect import Parameter
@@ -577,10 +575,12 @@ def __call__(self, callback):
         return callback
 
     def _unload_instance(self):
-        with suppress(ValueError):
+        try:
             if self.parser.remove_command(self.commands):
                 self.manager.unregister_commands(
                     self.command.command_to_register, self.on_command)
+        except ValueError:
+            pass
 
     @classmethod
     def on_command(cls, command, *args):

addons/source-python/packages/source-python/engines/precache.py

@@ -5,10 +5,6 @@
 # =============================================================================
 # >> IMPORTS
 # =============================================================================
-# Python Imports
-#   Contextlib
-from contextlib import suppress
-
 # Source.Python Imports
 #   Core
 from core import AutoUnload
@@ -119,8 +115,10 @@ def _server_spawn(self, game_event):
     def _unload_instance(self):
         """Remove from the downloads list and unregister server_spawn."""
         # Remove the path from the downloads list
-        with suppress(AttributeError):
+        try:
             self._downloads._unload_instance()
+        except AttributeError:
+            pass
 
         # Unregister the server_spawn event
         event_manager.unregister_for_event('server_spawn', self._server_spawn)

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

@@ -8,8 +8,6 @@
 # Python Imports
 #   Collections
 from collections import defaultdict
-#   Contextlib
-from contextlib import suppress
 #   Inspect
 from inspect import signature
 #   WeakRef
@@ -41,6 +39,7 @@
 from entities.classes import server_classes
 from entities.constants import WORLD_ENTITY_INDEX
 from entities.constants import DamageTypes
+from entities.datamaps import InputFunction
 from entities.helpers import index_from_inthandle
 from entities.helpers import index_from_pointer
 from entities.helpers import wrap_entity_mem_func
@@ -144,6 +143,17 @@ def __call__(cls, index, caching=None):
         # We are done, let's return the instance
         return obj
 
+    @cached_property(unbound=True)
+    def attributes(cls):
+        """Returns all the attributes available for this class.
+
+        :rtype: dict
+        """
+        attributes = {}
+        for cls in reversed(cls.mro()):
+            attributes.update(vars(cls))
+        return attributes
+
     @property
     def caching(cls):
         """Returns whether this class is caching its instances by default.
@@ -208,54 +218,57 @@ def __hash__(self):
 
     def __getattr__(self, attr):
         """Find if the attribute is valid and returns the appropriate value."""
-        # Loop through all of the entity's server classes
-        for instance in self.server_classes.values():
-
-            try:
-                # Get the attribute's value
-                value = getattr(instance, attr)
-            except AttributeError:
-                continue
+        # Try to resolve the dynamic attribute
+        try:
+            instance, value = self.dynamic_attributes[attr]
+        except KeyError:
+            raise AttributeError('Attribute "{0}" not found'.format(attr))
 
-            # Is the value a dynamic function?
-            if isinstance(value, MemberFunction):
+        # Is the attribute a property descriptor?
+        try:
+            value = value.__get__(instance)
+        except AttributeError:
+            pass
 
-                # Cache the value
-                with suppress(AttributeError):
-                    object.__setattr__(self, attr, value)
+        # Is the value a dynamic function?
+        if isinstance(value, (MemberFunction, InputFunction)):
 
-            # Return the attribute's value
-            return value
+            # Cache the value
+            try:
+                object.__setattr__(self, attr, value)
+            except AttributeError:
+                pass
 
-        # If the attribute is not found, raise an error
-        raise AttributeError('Attribute "{0}" not found'.format(attr))
+        return value
 
     def __setattr__(self, attr, 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)):
-
-            # Set the property's value
-            object.__setattr__(self, attr, value)
-
-            # No need to go further
-            return
+        try:
+            setter = type(self).attributes[attr].__set__
 
-        # Loop through all of the entity's server classes
-        for server_class, instance in self.server_classes.items():
+        # KeyError:
+        #   The attribute does not exist.
+        # AttributeError:
+        #   The attribute is not a descriptor.
+        except (KeyError, AttributeError):
 
-            # Does the current server class contain the given attribute?
-            if hasattr(server_class, attr):
+            # Try to resolve a dynamic attribute
+            try:
+                self, setter = self.dynamic_attributes[attr]
+                setter = setter.__set__
 
-                # Set the attribute's value
-                setattr(instance, attr, value)
+            # KeyError:
+            #   The attribute does not exist.
+            # AttributeError:
+            #   The attribute is not a descriptor.
+            except (KeyError, AttributeError):
 
-                # No need to go further
-                return
+                # Set the attribute to the given value
+                return object.__setattr__(self, attr, value)
 
-        # If the attribute is not found, just set the attribute
-        super().__setattr__(attr, value)
+        # Set the attribute's value
+        setter(self, value)
 
     def __dir__(self):
         """Return an alphabetized list of attributes for the instance."""
@@ -317,9 +330,21 @@ def server_classes(self):
         """Yield all server classes for the entity."""
         return {
             server_class: make_object(server_class, self.pointer) for
-            server_class in server_classes.get_entity_server_classes(self)
+            server_class in reversed(
+                server_classes.get_entity_server_classes(self)
+            )
         }
 
+    @cached_property
+    def dynamic_attributes(self):
+        """Returns the dynamic attributes for this entity."""
+        attributes = {}
+        for cls, instance in self.server_classes.items():
+            attributes.update(
+                {attr:(instance, getattr(cls, attr)) for attr in dir(cls)}
+            )
+        return attributes
+
     @cached_property
     def properties(self):
         """Iterate over all descriptors available for the entity."""
@@ -679,34 +704,44 @@ def take_damage(
         if attacker_index is not None:
 
             # Try to get the Entity instance of the attacker
-            with suppress(ValueError):
+            try:
                 attacker = Entity(attacker_index)
+            except ValueError:
+                pass
 
         # Was a weapon given?
         if weapon_index is not None:
 
             # Try to get the Weapon instance of the weapon
-            with suppress(ValueError):
+            try:
                 weapon = Weapon(weapon_index)
+            except ValueError:
+                pass
 
         # Is there a weapon but no attacker?
         if attacker is None and weapon is not None:
 
             # Try to get the attacker based off of the weapon's owner
-            with suppress(ValueError, OverflowError):
+            try:
                 attacker_index = index_from_inthandle(weapon.owner_handle)
                 attacker = Entity(attacker_index)
+            except (ValueError, OverflowError):
+                pass
 
         # Is there an attacker but no weapon?
         if attacker is not None and weapon is None:
 
             # Try to use the attacker's active weapon
-            with suppress(AttributeError):
+            try:
                 weapon = attacker.active_weapon
+            except AttributeError:
+                pass
 
         # Try to set the hitgroup
-        with suppress(AttributeError):
+        try:
             self.hitgroup = hitgroup
+        except AttributeError:
+            pass
 
         # Get a TakeDamageInfo instance
         take_damage_info = TakeDamageInfo()
@@ -795,8 +830,10 @@ def _on_networked_entity_deleted(index):
     for delay in _entity_delays.pop(index, ()):
 
         # Cancel the delay...
-        with suppress(ValueError):
+        try:
             delay.cancel()
+        except ValueError:
+            pass
 
     # Loop through all repeats...
     for repeat in _entity_repeats.pop(index, ()):

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

@@ -5,10 +5,6 @@
 # ============================================================================
 # >> IMPORTS
 # ============================================================================
-# Python Imports
-#   ContextLib
-from contextlib import suppress
-
 # Source.Python Imports
 #   Core
 from core import AutoUnload
@@ -98,8 +94,10 @@ def __delitem__(self, index):
             The index of the entity instance being removed.
         """
         # Remove the given index from the dictionary...
-        with suppress(KeyError):
+        try:
             super().__delitem__(index)
+        except KeyError:
+            pass
 
     def from_inthandle(self, inthandle):
         """Returns an entity instance from an inthandle.

addons/source-python/packages/source-python/listeners/tick.py

@@ -10,7 +10,6 @@
 import math
 import time
 
-from contextlib import suppress
 from enum import IntEnum
 from threading import Thread
 from warnings import warn
@@ -198,8 +197,10 @@ def time_elapsed(self):
         return time.time() - self._start_time
 
     def _unload_instance(self):
-        with suppress(ValueError):
+        try:
             self.cancel()
+        except ValueError:
+            pass
 
 
 # =============================================================================

addons/source-python/packages/source-python/settings/types.py

@@ -7,7 +7,6 @@
 # =============================================================================
 # Python
 from collections import OrderedDict
-from contextlib import suppress
 
 # Source.Python
 from cvars import ConVar
@@ -100,7 +99,7 @@ def get_setting(self, index):
         value = engine_server.get_client_convar_value(index, self.convar)
 
         # Try to typecast the value, suppressing ValueErrors
-        with suppress(ValueError):
+        try:
 
             # Typecast the given value
             value = self._typecast_value(value)
@@ -111,6 +110,9 @@ def get_setting(self, index):
                 # If so, return the value
                 return value
 
+        except ValueError:
+            pass
+
         # Get the client's uniqueid
         uniqueid = uniqueid_from_index(index)
 
@@ -124,7 +126,7 @@ def get_setting(self, index):
                 value = _player_settings_storage[uniqueid][self.convar]
 
                 # Try to typecast the value, suppressing ValueErrors
-                with suppress(ValueError):
+                try:
 
                     # Typecast the given value
                     value = self._typecast_value(value)
@@ -135,6 +137,9 @@ def get_setting(self, index):
                         # Return the value
                         return value
 
+                except ValueError:
+                    pass
+
         # Return the default value
         return self._get_default_value()
 

addons/source-python/packages/source-python/weapons/restrictions.py

@@ -389,7 +389,7 @@ def _on_weapon_bump(args):
         make_object(Player, args[0]), edict_from_pointer(args[1]).classname)
 
 
-if GAME_NAME in ('css', 'csgo'):
+if GAME_NAME in ('cstrike', 'csgo'):
     @EntityPreHook(EntityCondition.is_player, 'buy_internal')
     def _on_weapon_purchase(args):
         """Return whether the player is allowed to purchase the weapon."""