From 596bfff35a4742e3a55c64ae782086b15f12f01f Mon Sep 17 00:00:00 2001 From: Griatch Date: Tue, 15 Nov 2016 01:07:16 +0100 Subject: [PATCH] Do further cleanups in evmenu color handling; relates to #1117. --- evennia/utils/evmenu.py | 6 +++--- evennia/utils/evtable.py | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/evennia/utils/evmenu.py b/evennia/utils/evmenu.py index c44444b246..282e31750f 100644 --- a/evennia/utils/evmenu.py +++ b/evennia/utils/evmenu.py @@ -314,10 +314,10 @@ def evtable_options_formatter(optionlist, caller=None): raw_key = strip_ansi(key) if raw_key != key: # already decorations in key definition - table.append(ANSIString(" |lc%s|lt%s|le: %s" % (raw_key, key, desc))) + table.append(" |lc%s|lt%s|le: %s" % (raw_key, key, desc)) else: # add a default white color to key - table.append(ANSIString(" |lc%s|lt|w%s|n|le: %s" % (raw_key, raw_key, desc))) + table.append(" |lc%s|lt|w%s|n|le: %s" % (raw_key, raw_key, desc)) ncols = (_MAX_TEXT_WIDTH // table_width_max) + 1 # number of ncols nlastcol = nlist % ncols # number of elements left in last row @@ -356,7 +356,7 @@ def underline_node_formatter(nodetext, optionstext, caller=None): total_width = max(options_width_max, nodetext_width_max) separator1 = "_" * total_width + "\n\n" if nodetext_width_max else "" separator2 = "\n" + "_" * total_width + "\n\n" if total_width else "" - return separator1 + nodetext + separator2 + optionstext + return separator1 + "|n" + nodetext + "|n" + separator2 + "|n" + optionstext def null_node_formatter(nodetext, optionstext, caller=None): diff --git a/evennia/utils/evtable.py b/evennia/utils/evtable.py index d8de04ec37..82941f7caf 100644 --- a/evennia/utils/evtable.py +++ b/evennia/utils/evtable.py @@ -475,7 +475,8 @@ class EvCell(object): Apply all EvCells' formatting operations. """ - return self._border(self._pad(self._valign(self._align(self._fit_width(self.data))))) + data = self._border(self._pad(self._valign(self._align(self._fit_width(self.data))))) + return data def _split_lines(self, text): """ @@ -812,7 +813,7 @@ class EvCell(object): def __repr__(self): self.formatted = self._reformat() - return unicode(ANSIString("EvCel<%s>" % self.formatted)) + return unicode(ANSIString("" % self.formatted)) def __str__(self): "returns cell contents on string form" @@ -926,7 +927,7 @@ class EvColumn(object): self.column[index].reformat(**kwargs) def __repr__(self): - return "EvColumn<%i cels>" % len(self.column) + return "" % ("\n ".join([repr(cell) for cell in self.column])) def __len__(self): return len(self.column) def __iter__(self):