Rooba
/
rich
mirror of https://github.com/Textualize/rich.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added isascii function for pythn3.6

This commit is contained in:
Will McGugan 2020-10-12 17:25:33 +01:00
parent 05bf78b17a
commit 5a075eb118
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rich/highlighter.py
View File

@ -85,8 +85,8 @@ class ReprHighlighter(RegexHighlighter):
_combine_regex(
r"(?P<ipv4>[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3})",
r"(?P<ipv6>([A-Fa-f0-9]{1,4}::?){1,7}[A-Fa-f0-9]{1,4})",
r"(?P<eui64>([0-9A-Fa-f]{1,2}-){7}[0-9A-Fa-f]{1,2}|([0-9A-Fa-f]{1,2}:){7}[0-9A-Fa-f]{1,2}|([0-9A-Fa-f]{4}\.){3}[0-9A-Fa-f]{4})",
r"(?P<eui48>([0-9A-Fa-f]{1,2}-){5}[0-9A-Fa-f]{1,2}|([0-9A-Fa-f]{1,2}:){5}[0-9A-Fa-f]{1,2}|([0-9A-Fa-f]{4}\.){2}[0-9A-Fa-f]{4})",
r"(?P<eui64>(?:[0-9A-Fa-f]{1,2}-){7}[0-9A-Fa-f]{1,2}|(?:[0-9A-Fa-f]{1,2}:){7}[0-9A-Fa-f]{1,2}|(?:[0-9A-Fa-f]{4}\.){3}[0-9A-Fa-f]{4})",
r"(?P<eui48>(?:[0-9A-Fa-f]{1,2}-){5}[0-9A-Fa-f]{1,2}|(?:[0-9A-Fa-f]{1,2}:){5}[0-9A-Fa-f]{1,2}|(?:[0-9A-Fa-f]{4}\.){2}[0-9A-Fa-f]{4})",
r"(?P<brace>[\{\[\(\)\]\}])",
r"(?P<attrib_name>\w+?)=(?P<attrib_value>\"?[\w_]+\"?)?",
r"(?P<bool_true>True)|(?P<bool_false>False)|(?P<none>None)",

6
rich/rule.py
View File

@ -42,9 +42,13 @@ class Rule(JupyterMixin):
) -> RenderResult:
width = options.max_width
# Python3.6 doesn't have an isascii method on str
isascii = getattr(str, "isascii", None) or (
lambda s: all(ord(c) < 128 for c in s)
)
characters = (
"-"
if (options.ascii_only and not self.characters.isascii())
if (options.ascii_only and not isascii(self.characters))
else self.characters
)