From 60606898f880c6132fedc0c91315f585535e9137 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 31 Mar 2018 12:40:57 +0200
Subject: [PATCH] Fix of output handling in msg() when text is None

---
 evennia/accounts/accounts.py | 16 +++++++++-------
 evennia/objects/objects.py   | 16 +++++++++-------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/evennia/accounts/accounts.py b/evennia/accounts/accounts.py
index 48d03d8dc8..fe7693cce0 100644
--- a/evennia/accounts/accounts.py
+++ b/evennia/accounts/accounts.py
@@ -421,17 +421,19 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
 
         kwargs["options"] = options
 
-        if not (isinstance(text, basestring) or isinstance(text, tuple)):
-            # sanitize text before sending across the wire
-            try:
-                text = to_str(text, force_string=True)
-            except Exception:
-                text = repr(text)
+        if text is not None:
+            if not (isinstance(text, basestring) or isinstance(text, tuple)):
+                # sanitize text before sending across the wire
+                try:
+                    text = to_str(text, force_string=True)
+                except Exception:
+                    text = repr(text)
+            kwargs['text'] = text
 
         # session relay
         sessions = make_iter(session) if session else self.sessions.all()
         for session in sessions:
-            session.data_out(text=text, **kwargs)
+            session.data_out(**kwargs)
 
     def execute_cmd(self, raw_string, session=None, **kwargs):
         """
diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py
index f583570707..8cdf546706 100644
--- a/evennia/objects/objects.py
+++ b/evennia/objects/objects.py
@@ -535,17 +535,19 @@ class DefaultObject(with_metaclass(TypeclassBase, ObjectDB)):
         except Exception:
             logger.log_trace()
 
-        if not (isinstance(text, basestring) or isinstance(text, tuple)):
-            # sanitize text before sending across the wire
-            try:
-                text = to_str(text, force_string=True)
-            except Exception:
-                text = repr(text)
+        if text is not None:
+            if not (isinstance(text, basestring) or isinstance(text, tuple)):
+                # sanitize text before sending across the wire
+                try:
+                    text = to_str(text, force_string=True)
+                except Exception:
+                    text = repr(text)
+            kwargs['text'] = text
 
         # relay to session(s)
         sessions = make_iter(session) if session else self.sessions.all()
         for session in sessions:
-            session.data_out(text=text, **kwargs)
+            session.data_out(**kwargs)
 
 
     def for_contents(self, func, exclude=None, **kwargs):