ahamilton/eris
1
0
Fork 0
Code Releases Activity

Revert "tools: Executables attribute is redundant in the yaml file."

Browse source 
This reverts commit a5a7e24d4f.
This commit is contained in:
Andrew Hamilton 2018-04-20 18:18:48 +10:00
parent a5a7e24d4f
commit 45200a706f
6 changed files with 25 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

28
vigil/termstr.py
View file

@ -3,7 +3,6 @@
# Licensed under the Artistic License 2.0.
import collections
import html
import itertools
import os
import weakref
@ -103,16 +102,6 @@ class CharStyle:
return "".join([terminal.normal, fg_termcode, bg_termcode, bold_code,
italic_code, underline_code])
def as_html(self):
bold_code = "font-weight:bold; " if self.is_bold else ""
italic_code = "font-style:italic; " if self.is_italic else ""
underline_code = ("text-decoration:underline; "
if self.is_underlined else "")
return ("<style>.S%i {font-size:80%%; color:rgb%r; "
"background-color:rgb%r; %s%s%s}</style>" %
(id(self), self.fg_color, self.bg_color, bold_code,
italic_code, underline_code))
def _join_lists(lists):
return list(itertools.chain.from_iterable(lists))
@ -121,9 +110,10 @@ def _join_lists(lists):
class TermStr(collections.UserString):
def __init__(self, data, style=CharStyle()):
try:
self.data, self.style = data.data, data.style
except AttributeError:
if isinstance(data, self.__class__):
self.data = data.data
self.style = data.style
else:
self.data = data
self.style = (style if isinstance(style, tuple)
else (style,) * len(data))
@ -272,13 +262,3 @@ class TermStr(collections.UserString):
return CharStyle(style.fg_color, bg_color, is_bold=style.is_bold,
is_underlined=style.is_underlined)
return self.transform_style(set_bgcolor)
def as_html(self):
result = []
styles = set()
for style, str_, position in self._partition_style():
styles.add(style)
encoded = str(html.escape(str_).encode("ascii", "xmlcharrefreplace"))[2:-1]
encoded = encoded.replace("\\\\", "\\")
result.append('<span class="S%i">%s</span>' % (id(style), encoded))
return "".join(result), styles