From c15d5a26c4106ed48c42524f1aed1789214494d0 Mon Sep 17 00:00:00 2001 From: Griatch Date: Tue, 28 Feb 2017 08:08:33 +0100 Subject: [PATCH] Add another errback handler for error in #1207. --- evennia/server/webserver.py | 4 +++- evennia/utils/evtable.py | 10 ++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/evennia/server/webserver.py b/evennia/server/webserver.py index beda2d5ec..e974226f7 100644 --- a/evennia/server/webserver.py +++ b/evennia/server/webserver.py @@ -23,6 +23,8 @@ from twisted.web.wsgi import WSGIResource from django.conf import settings from django.core.handlers.wsgi import WSGIHandler +from evennia.utils import logger + _UPSTREAM_IPS = settings.UPSTREAM_IPS _DEBUG = settings.DEBUG @@ -70,7 +72,7 @@ class EvenniaReverseProxyResource(ReverseProxyResource): resource (EvenniaReverseProxyResource): A proxy resource. """ - request.notifyFinish().addErrback(lambda f: f.cancel()) + request.notifyFinish().addErrback(lambda f: logger.log_trace("%s\nCaught errback in webserver.py:75." % f)) return EvenniaReverseProxyResource( self.host, self.port, self.path + '/' + urlquote(path, safe=""), self.reactor) diff --git a/evennia/utils/evtable.py b/evennia/utils/evtable.py index 748438beb..3606ad729 100644 --- a/evennia/utils/evtable.py +++ b/evennia/utils/evtable.py @@ -1241,6 +1241,9 @@ class EvTable(object): # actual table. This allows us to add columns/rows # and re-balance over and over without issue. self.worktable = deepcopy(self.table) + + self._borders() + return options = copy(self.options) # balance number of rows to make a rectangular table @@ -1572,3 +1575,10 @@ def _test(): table.reformat_column(3, width=30, align='r') print(unicode(table)) return table + +def _test2(): + table = EvTable("|yHeading1|n", "|B|[GHeading2|n", "Heading3") + for i in range(100): + table.add_row("This is col 0, row %i" % i, "|gThis is col 1, row |w%i|n|g.|n" % i, "This is col 2, row %i" % i) + return table +