From bedcb7d5f4b954f191d922c8ee71fa6002b99d5b Mon Sep 17 00:00:00 2001 From: Griatch Date: Tue, 19 Feb 2019 20:18:36 +0100 Subject: [PATCH] Testing new unit tests --- evennia/server/portal/amp.py | 2 ++ evennia/utils/text2html.py | 1 + evennia/web/website/templates/website/index.html | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/evennia/server/portal/amp.py b/evennia/server/portal/amp.py index 6182f8d24c..32d88ce8bd 100644 --- a/evennia/server/portal/amp.py +++ b/evennia/server/portal/amp.py @@ -274,6 +274,8 @@ class AMPMultiConnectionProtocol(amp.AMP): self.send_mode = True self.send_task = None self.multibatches = 0 + # later twisted amp has its own __init__ + super(AMPMultiConnectionProtocol, self).__init__(*args, **kwargs) def dataReceived(self, data): """ diff --git a/evennia/utils/text2html.py b/evennia/utils/text2html.py index 94c5587533..1269f1a2f0 100644 --- a/evennia/utils/text2html.py +++ b/evennia/utils/text2html.py @@ -215,6 +215,7 @@ class TextToHTMLparser(object): text (str): Processed text. """ + return text return text.replace(r'\n', r'
') def convert_urls(self, text): diff --git a/evennia/web/website/templates/website/index.html b/evennia/web/website/templates/website/index.html index 06ece50f3c..3c7a99df43 100644 --- a/evennia/web/website/templates/website/index.html +++ b/evennia/web/website/templates/website/index.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "website/base.html" %} {% block titleblock %}Home{% endblock %}