From 470c2ebef7db00fbda2c3176c0390164dfd6f3fd Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 5 Aug 2022 19:41:39 +0000 Subject: [PATCH] Changes bare try/except to callable check. --- evennia/typeclasses/attributes.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/evennia/typeclasses/attributes.py b/evennia/typeclasses/attributes.py index 90492a13d2..3a3d8c7281 100644 --- a/evennia/typeclasses/attributes.py +++ b/evennia/typeclasses/attributes.py @@ -176,7 +176,7 @@ class AttributeProperty: attrhandler_name = "attributes" - def __init__(self, default=None, category=None, strattr=False, lockstring="", autocreate=True): + def __init__(self, default=None, default_factory=None, category=None, strattr=False, lockstring="", autocreate=True): """ Initialize an Attribute as a property descriptor. @@ -209,10 +209,10 @@ class AttributeProperty: Tries returning a new instance of default if callable. """ - try: + if callable(self.__default): return self.__default() - except: - return self.__default + + return self.__default @_default.setter def _default(self, value):