Removed all occurrences of contextlib.suppress because it is unnecessary slow.

Fixed an issue with Entity's dynamic attributes not being properly set anymore.

Author: jordanbriere

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
@@ -227,15 +225,19 @@ def __getattr__(self, attr):
             raise AttributeError('Attribute "{0}" not found'.format(attr))
 
         # Is the attribute a property descriptor?
-        with suppress(AttributeError):
+        try:
             value = value.__get__(instance)
+        except AttributeError:
+            pass
 
         # Is the value a dynamic function?
         if isinstance(value, (MemberFunction, InputFunction)):
 
             # Cache the value
-            with suppress(AttributeError):
+            try:
                 object.__setattr__(self, attr, value)
+            except AttributeError:
+                pass
 
         return value
 
@@ -253,7 +255,8 @@ def __setattr__(self, attr, value):
 
             # Try to resolve a dynamic attribute
             try:
-                self, setter = self.dynamic_attributes[attr].__set__
+                self, setter = self.dynamic_attributes[attr]
+                setter = setter.__set__
 
             # KeyError:
             #   The attribute does not exist.
@@ -334,7 +337,7 @@ def server_classes(self):
 
     @cached_property
     def dynamic_attributes(self):
-        """Returns the dynamic attributes for this entities."""
+        """Returns the dynamic attributes for this entity."""
         attributes = {}
         for cls, instance in self.server_classes.items():
             attributes.update(
@@ -701,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()
@@ -817,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()