autopep8

[rainbowstream.git] / rainbowstream / colors.py

diff --git a/rainbowstream/colors.py b/rainbowstream/colors.py
index f3c7f85686f03cfd717c4354102d9aff6909a1f1..909a85af3e5fc0bcc9fc32dad41d0935ff4c70c7 100644 (file)
--- a/rainbowstream/colors.py
+++ b/rainbowstream/colors.py
@@ -2,6 +2,8 @@ import random
 import itertools
 from functools import wraps
 from pyfiglet import figlet_format
+from .config import *
+from functools import reduce
 
 
 def basic_color(code):
@@ -20,56 +22,49 @@ def RGB(code):
     """
     256 colors supported
     """
-    def inner(text, bold=True):
+    def inner(text):
         c = code
-        if bold:
-            c = "1;%s" % c
         return "\033[38;5;%sm%s\033[0m" % (c, text)
     return inner
 
 
-default          = basic_color('39')
-black            = basic_color('30')
-red              = basic_color('31')
-green            = basic_color('32')
-yellow           = basic_color('33')
-blue             = basic_color('34')
-magenta          = basic_color('35')
-cyan             = basic_color('36')
-grey             = basic_color('90')
-light_red        = basic_color('91')
-light_green      = basic_color('92')
-light_yellow     = basic_color('93')
-light_blue       = basic_color('94')
-light_magenta    = basic_color('95')
-light_cyan       = basic_color('96')
-white            = basic_color('97')
-
-on_default       = basic_color('49')
-on_black         = basic_color('40')
-on_red           = basic_color('41')
-on_green         = basic_color('42')
-on_yellow        = basic_color('43')
-on_blue          = basic_color('44')
-on_magenta       = basic_color('45')
-on_cyan          = basic_color('46')
-on_grey          = basic_color('100')
-on_light_red     = basic_color('101')
-on_light_green   = basic_color('102')
-on_light_yellow  = basic_color('103')
-on_light_blue    = basic_color('104')
+default = basic_color('39')
+black = basic_color('30')
+red = basic_color('31')
+green = basic_color('32')
+yellow = basic_color('33')
+blue = basic_color('34')
+magenta = basic_color('35')
+cyan = basic_color('36')
+grey = basic_color('90')
+light_red = basic_color('91')
+light_green = basic_color('92')
+light_yellow = basic_color('93')
+light_blue = basic_color('94')
+light_magenta = basic_color('95')
+light_cyan = basic_color('96')
+white = basic_color('97')
+
+on_default = basic_color('49')
+on_black = basic_color('40')
+on_red = basic_color('41')
+on_green = basic_color('42')
+on_yellow = basic_color('43')
+on_blue = basic_color('44')
+on_magenta = basic_color('45')
+on_cyan = basic_color('46')
+on_grey = basic_color('100')
+on_light_red = basic_color('101')
+on_light_green = basic_color('102')
+on_light_yellow = basic_color('103')
+on_light_blue = basic_color('104')
 on_light_magenta = basic_color('105')
-on_light_cyan    = basic_color('106')
-on_white         = basic_color('107')
-
-colors_shuffle = [
-    grey,
-    light_red,
-    light_green,
-    light_yellow,
-    light_blue,
-    light_magenta,
-    light_cyan]
+on_light_cyan = basic_color('106')
+on_white = basic_color('107')
+
+colors_shuffle = [locals()[i.encode('utf8')] if not i.startswith(
+    'RGB_') else RGB(int(i[4:])) for i in c['CYCLE_COLOR']]
+
 background_shuffle = [
     on_grey,
     on_light_red,