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

Merge branch 'master' into develop

Browse source
This commit is contained in:
Griatch 2018-03-17 23:29:27 +01:00
commit f7ce9cc896
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/accounts/accounts.py
View file

@ -421,7 +421,7 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
kwargs["options"] = options kwargs["options"] = options
if text and not (isinstance(text, basestring) or isinstance(text, tuple)): if not (isinstance(text, basestring) or isinstance(text, tuple)):
# sanitize text before sending across the wire # sanitize text before sending across the wire
try: try:
text = to_str(text, force_string=True) text = to_str(text, force_string=True)

3
evennia/objects/objects.py
View file

@ -569,8 +569,7 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
except Exception: except Exception:
logger.log_trace() logger.log_trace()
if not (isinstance(text, basestring) or isinstance(text, tuple)):
if text and not (isinstance(text, basestring) or isinstance(text, tuple)):
# sanitize text before sending across the wire # sanitize text before sending across the wire
try: try:
text = to_str(text, force_string=True) text = to_str(text, force_string=True)