Resolves merge conflicts

main
byt3bl33d3r 2015-10-24 10:43:01 -06:00
commit c341c305bc
1 changed files with 6 additions and 6 deletions

View File

@ -83,21 +83,21 @@ def print_att(message):
def yellow(text):
try:
colored(text.decode('utf8'), 'yellow', attrs=['bold'])
return colored(text.decode('utf8'), 'yellow', attrs=['bold'])
except UnicodeDecodeError and UnicodeEncodeError:
colored(unicode(text, errors='ignore'), 'yellow', attrs=['bold'])
return colored(unicode(text, errors='ignore'), 'yellow', attrs=['bold'])
def green(text):
try:
colored(text.decode('utf8'), 'green', attrs=['bold'])
return colored(text.decode('utf8'), 'green', attrs=['bold'])
except UnicodeDecodeError and UnicodeEncodeError:
colored(unicode(text, errors='ignore'), 'green', attrs=['bold'])
return colored(unicode(text, errors='ignore'), 'green', attrs=['bold'])
def red(text):
try:
colored(text.decode('utf8'), 'red', attrs=['bold'])
return colored(text.decode('utf8'), 'red', attrs=['bold'])
except UnicodeDecodeError and UnicodeEncodeError:
colored(unicode(text, errors='ignore'), 'red', attrs=['bold'])
return colored(unicode(text, errors='ignore'), 'red', attrs=['bold'])
# Structures
# Taken from http://insecurety.net/?p=768