no colors for powershell users

This commit is contained in:
2018-07-03 11:24:32 -04:00
parent 779d247b99
commit c024dbc72d
+49 -23
View File
@@ -12,19 +12,34 @@ import os
import re
import sys
import shellingham
import colorama
PY3 = sys.version_info[0] >= 3
__all__ = (
'red', 'green', 'yellow', 'blue',
'black', 'magenta', 'cyan', 'white', 'normal',
'clean', 'disable',
"red",
"green",
"yellow",
"blue",
"black",
"magenta",
"cyan",
"white",
"normal",
"clean",
"disable",
)
COLORS = __all__[:-2]
if 'get_ipython' in dir():
is_ipython = "get_ipython" in dir()
try:
is_powershell = "powershell" in shellingham.detect_shell()[0]
except shellingham.ShellDetectionFailure:
pass
if is_ipython or is_powershell:
"""
when ipython is fired lot of variables like _oh, etc are used.
There are so many ways to find current python interpreter is ipython.
@@ -37,16 +52,17 @@ else:
class ColoredString(object):
"""Enhanced string for __len__ operations on Colored output."""
def __init__(self, color, s, always_color=False, bold=False):
super(ColoredString, self).__init__()
if not PY3 and isinstance(s, unicode):
self.s = s.encode('utf-8')
self.s = s.encode("utf-8")
else:
self.s = s
self.color = color
self.always_color = always_color
self.bold = bold
if os.environ.get('PIPENV_FORCE_COLOR'):
if os.environ.get("PIPENV_FORCE_COLOR"):
self.always_color = True
def __getattr__(self, att):
@@ -62,12 +78,19 @@ class ColoredString(object):
return [self._new(x) for x in result]
else:
return result
return func_help
@property
def color_str(self):
style = 'BRIGHT' if self.bold else 'NORMAL'
c = '%s%s%s%s%s' % (getattr(colorama.Fore, self.color), getattr(colorama.Style, style), self.s, colorama.Fore.RESET, getattr(colorama.Style, 'NORMAL'))
style = "BRIGHT" if self.bold else "NORMAL"
c = "%s%s%s%s%s" % (
getattr(colorama.Fore, self.color),
getattr(colorama.Style, style),
self.s,
colorama.Fore.RESET,
getattr(colorama.Style, "NORMAL"),
)
if self.always_color:
return c
@@ -85,12 +108,13 @@ class ColoredString(object):
def __unicode__(self):
value = self.color_str
if isinstance(value, bytes):
return value.decode('utf8')
return value.decode("utf8")
return value
if PY3:
__str__ = __unicode__
else:
def __str__(self):
return self.color_str
@@ -104,57 +128,59 @@ class ColoredString(object):
return str(other) + str(self.color_str)
def __mul__(self, other):
return (self.color_str * other)
return self.color_str * other
def _new(self, s):
return ColoredString(self.color, s)
def clean(s):
strip = re.compile("([^-_a-zA-Z0-9!@#%&=,/'\";:~`\$\^\*\(\)\+\[\]\.\{\}\|\?\<\>\\]+|[^\s]+)")
txt = strip.sub('', str(s))
strip = re.compile(
"([^-_a-zA-Z0-9!@#%&=,/'\";:~`\$\^\*\(\)\+\[\]\.\{\}\|\?\<\>\\]+|[^\s]+)"
)
txt = strip.sub("", str(s))
strip = re.compile(r'\[\d+m')
txt = strip.sub('', txt)
strip = re.compile(r"\[\d+m")
txt = strip.sub("", txt)
return txt
def normal(string, always=False, bold=False):
return ColoredString('RESET', string, always_color=always, bold=bold)
return ColoredString("RESET", string, always_color=always, bold=bold)
def black(string, always=False, bold=False):
return ColoredString('BLACK', string, always_color=always, bold=bold)
return ColoredString("BLACK", string, always_color=always, bold=bold)
def red(string, always=False, bold=False):
return ColoredString('RED', string, always_color=always, bold=bold)
return ColoredString("RED", string, always_color=always, bold=bold)
def green(string, always=False, bold=False):
return ColoredString('GREEN', string, always_color=always, bold=bold)
return ColoredString("GREEN", string, always_color=always, bold=bold)
def yellow(string, always=False, bold=False):
return ColoredString('YELLOW', string, always_color=always, bold=bold)
return ColoredString("YELLOW", string, always_color=always, bold=bold)
def blue(string, always=False, bold=False):
return ColoredString('BLUE', string, always_color=always, bold=bold)
return ColoredString("BLUE", string, always_color=always, bold=bold)
def magenta(string, always=False, bold=False):
return ColoredString('MAGENTA', string, always_color=always, bold=bold)
return ColoredString("MAGENTA", string, always_color=always, bold=bold)
def cyan(string, always=False, bold=False):
return ColoredString('CYAN', string, always_color=always, bold=bold)
return ColoredString("CYAN", string, always_color=always, bold=bold)
def white(string, always=False, bold=False):
# This upsets people...
return ColoredString('WHITE', string, always_color=always, bold=bold)
return ColoredString("WHITE", string, always_color=always, bold=bold)
def disable():