From e0d4f6a6c34233689dcc4ccfbf44d5ba2ed5ccdd Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 4 Jun 2016 19:41:17 +0200
Subject: [PATCH] Fixed a bug in channelhandler if the channel had no desc.

---
 evennia/comms/channelhandler.py | 2 +-
 evennia/utils/text2html.py      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/evennia/comms/channelhandler.py b/evennia/comms/channelhandler.py
index ff6e3fe71b..f5a124005d 100644
--- a/evennia/comms/channelhandler.py
+++ b/evennia/comms/channelhandler.py
@@ -190,7 +190,7 @@ class ChannelHandler(object):
         key = channel.key
         cmd.__doc__ = cmd.__doc__.format(channelkey=key,
                                          lower_channelkey=key.strip().lower(),
-                                         channeldesc=channel.db.desc.strip())
+                                         channeldesc=channel.attributes.get("desc", default="").strip())
         self.cached_channel_cmds.append(cmd)
         self.cached_cmdsets = {}
 
diff --git a/evennia/utils/text2html.py b/evennia/utils/text2html.py
index 1608c10260..0bdcb2c9d8 100644
--- a/evennia/utils/text2html.py
+++ b/evennia/utils/text2html.py
@@ -15,7 +15,6 @@ import re
 import cgi
 from .ansi import *
 
-import time
 
 # All xterm256 RGB equivalents