diff --git a/src/objects/admin.py b/src/objects/admin.py index 4cf2a661a3..fa096539ba 100644 --- a/src/objects/admin.py +++ b/src/objects/admin.py @@ -31,7 +31,8 @@ class ObjectCreateForm(forms.ModelForm): db_key = forms.CharField(label="Name/Key", widget=forms.TextInput(attrs={'size':'78'}), help_text="Main identifier, like 'apple', 'strong guy', 'Elizabeth' etc. If creating a Character, check so the name is unique among characters!",) - db_typeclass_path = forms.CharField(label="Typeclass",initial="Change to (for example) %s or %s." % (settings.BASE_OBJECT_TYPECLASS, settings.BASE_CHARACTER_TYPECLASS), + db_typeclass_path = forms.CharField(label="Typeclass", + initial=settings.BASE_OBJECT_TYPECLASS, widget=forms.TextInput(attrs={'size':'78'}), help_text="This defines what 'type' of entity this is. This variable holds a Python path to a module with a valid Evennia Typeclass. If you are creating a Character you should use the typeclass defined by settings.BASE_CHARACTER_TYPECLASS or one derived from that.") #db_permissions = forms.CharField(label="Permissions", @@ -40,7 +41,7 @@ class ObjectCreateForm(forms.ModelForm): # widget=forms.TextInput(attrs={'size':'78'}), # help_text="a comma-separated list of text strings checked by certain locks. They are mainly of use for Character objects. Character permissions overload permissions defined on a controlling Player. Most objects normally don't have any permissions defined.") db_cmdset_storage = forms.CharField(label="CmdSet", - initial=settings.CMDSET_CHARACTER, + initial="", required=False, widget=forms.TextInput(attrs={'size':'78'}), help_text="Most non-character objects don't need a cmdset and can leave this field blank.") diff --git a/src/utils/utils.py b/src/utils/utils.py index 57cd1ca2fc..c4f2b7ffed 100644 --- a/src/utils/utils.py +++ b/src/utils/utils.py @@ -540,7 +540,7 @@ def run_async(to_execute, *args, **kwargs): instead are used to define the executable environment that should be available to execute the code in to_execute. - run_async will relay executed code to a thread. + run_async will relay executed code to a thread or procpool. Use this function with restrain and only for features/commands that you know has no influence on the cause-and-effect order of your @@ -557,8 +557,8 @@ def run_async(to_execute, *args, **kwargs): """ # handle special reserved input kwargs - callback = convert_return(kwargs.pop("at_return", None)) - errback = convert_err(kwargs.pop("at_err", None)) + callback = kwargs.pop("at_return", None) + errback = kwargs.pop("at_err", None) callback_kwargs = kwargs.pop("at_return_kwargs", {}) errback_kwargs = kwargs.pop("at_err_kwargs", {})