Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Resolve merge conflicts

Browse source
This commit is contained in:
Griatch 2020-09-19 14:19:40 +02:00
commit 443310b1c4
22 changed files with 76 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evennia/scripts/tickerhandler.py
View file

@ -344,8 +344,10 @@ class TickerHandler(object):
raise TypeError(f"{callback} is not a callable function or method.")
if outobj and not inherits_from(outobj, "evennia.typeclasses.models.TypedObject"):
raise TypeError(f"{callback} is a method on a normal object - it must "
"be either a method on a typeclass, or a stand-alone function.")
raise TypeError(
f"{callback} is a method on a normal object - it must "
"be either a method on a typeclass, or a stand-alone function."
)
return outobj, outpath, outcallfunc