Better constifying of color/font chars

5 files changed, 17 insertions, 17 deletions

diff --git a/modules/8ball.py b/modules/8ball.py
index 1aa7df12..5080af18 100644
--- a/modules/8ball.py
+++ b/modules/8ball.py
@@ -20,7 +20,7 @@ CHOICES = [
     "Naturally",
     "Reply hazy, try again later",
     utils.irc.underline(utils.irc.color("DO NOT WASTE MY TIME",
-        utils.irc.COLOR_RED)),
+        utils.consts.RED)),
     "Hmm... Could be!",
     "I'm leaning towards no",
     "Without a doubt",
diff --git a/modules/commands.py b/modules/commands.py
index 39ff4564..9e65a302 100644
--- a/modules/commands.py
+++ b/modules/commands.py
@@ -1,7 +1,7 @@
 import re
 from src import EventManager, ModuleManager, utils
 
-STR_MORE = "%s (more...)" % utils.irc.FONT_RESET
+STR_MORE = "%s (more...)" % utils.consts.RESET
 STR_CONTINUED = "(...continued) "
 
 COMMAND_METHOD = "command-method"
@@ -44,7 +44,7 @@ class Out(object):
 
             prefix = ""
             if not self._hide_prefix:
-                prefix = utils.irc.FONT_RESET + "[%s] " % self.prefix()
+                prefix = utils.consts.RESET + "[%s] " % self.prefix()
 
             method = self._get_method()
             if method == "PRIVMSG":
@@ -68,11 +68,11 @@ class Out(object):
 class StdOut(Out):
     def prefix(self):
         return utils.irc.color(utils.irc.bold(self.module_name),
-            utils.irc.COLOR_GREEN)
+            utils.consts.GREEN)
 class StdErr(Out):
     def prefix(self):
         return utils.irc.color(utils.irc.bold("!"+self.module_name),
-            utils.irc.COLOR_RED)
+            utils.consts.RED)
 
 def _command_method_validate(s):
     if s.upper() in COMMAND_METHODS:
diff --git a/modules/ducks.py b/modules/ducks.py
index cb6ff4af..2de31dfa 100644
--- a/modules/ducks.py
+++ b/modules/ducks.py
@@ -174,7 +174,7 @@ class Module(ModuleManager.BaseModule):
             # rare!
             message = random.choice(DUCK_MESSAGE_RARE)
             duck = utils.irc.color(utils.irc.bold(duck + message),
-                utils.irc.COLOR_RED)
+                utils.consts.RED)
         else:
             # not rare!
             duck += random.choice(DUCK_MESSAGE)
diff --git a/modules/github.py b/modules/github.py
index 610de3b6..075c2fd0 100644
--- a/modules/github.py
+++ b/modules/github.py
@@ -81,15 +81,15 @@ class Module(ModuleManager.BaseModule):
             url = COMMIT_URL % (full_name, id[:8])
 
             added = utils.irc.color("+%d" % len(commit["added"]),
-                utils.irc.COLOR_GREEN)
+                utils.consts.GREEN)
             added = utils.irc.bold(added)
 
             removed = utils.irc.color("-%d" % len(commit["removed"]),
-                utils.irc.COLOR_RED)
+                utils.consts.RED)
             removed = utils.irc.bold(removed)
 
             modified = utils.irc.color("±%d" % len(commit["modified"]),
-                utils.irc.COLOR_PURPLE)
+                utils.consts.PURPLE)
             modified = utils.irc.bold(modified)
 
             outputs.append("(%s) [%s/%s/%s files] commit by '%s': %s - %s"
@@ -110,10 +110,10 @@ class Module(ModuleManager.BaseModule):
         action_desc = action
         if action == "closed":
             if data["pull_request"]["merged"]:
-                action_desc = utils.irc.color("merged", utils.irc.COLOR_GREEN)
+                action_desc = utils.irc.color("merged", utils.consts.GREEN)
             else:
                 action_desc = utils.irc.color("closed without merging",
-                    utils.irc.COLOR_RED)
+                    utils.consts.RED)
             action_desc = utils.irc.bold(action_desc)
 
         pr_title = data["pull_request"]["title"]
diff --git a/modules/nr.py b/modules/nr.py
index 6cacd9fc..b39f6050 100644
--- a/modules/nr.py
+++ b/modules/nr.py
@@ -19,9 +19,9 @@ class Module(ModuleManager.BaseModule):
     _client = None
 
     PASSENGER_ACTIVITIES = ["U", "P", "R"]
-    COLOURS = [utils.irc.COLOR_LIGHTBLUE, utils.irc.COLOR_GREEN,
-        utils.irc.COLOR_RED, utils.irc.COLOR_CYAN, utils.irc.COLOR_LIGHTGREY,
-        utils.irc.COLOR_ORANGE]
+    COLOURS = [utils.consts.LIGHTBLUE, utils.consts.GREEN,
+        utils.consts.RED, utils.consts.CYAN, utils.consts.LIGHTGREY,
+        utils.consts.ORANGE]
 
     @property
     def client(self):
@@ -184,7 +184,7 @@ class Module(ModuleManager.BaseModule):
             severe_summary = ""
             if nrcc_severe:
                 severe_summary += ", "
-                severe_summary += utils.irc.bold(utils.irc.color("%s severe messages" % nrcc_severe, utils.irc.COLOR_RED))
+                severe_summary += utils.irc.bold(utils.irc.color("%s severe messages" % nrcc_severe, utils.consts.RED))
             station_summary = "%s (%s, %s%s)" % (query["locationName"], query["crs"], query["stationManagerCode"], severe_summary)
 
         if not "trainServices" in query and not "busServices" in query and not "ferryServices" in query:
@@ -365,7 +365,7 @@ class Module(ModuleManager.BaseModule):
         if "delayReason" in query:
             disruptions.append("Delayed (%s%s)" % (query["delayReason"]["value"], " at " + query["delayReason"]["_tiploc"] if query["delayReason"]["_tiploc"] else ""))
         if disruptions and not external:
-            disruptions = utils.irc.color(", ".join(disruptions), utils.irc.COLOR_RED) + " "
+            disruptions = utils.irc.color(", ".join(disruptions), utils.consts.RED) + " "
         elif disruptions and external:
             disruptions = ", ".join(disruptions)
         else: disruptions = ""
@@ -490,7 +490,7 @@ class Module(ModuleManager.BaseModule):
         else:
             event["stdout"].write("%s%s %s %s (%s/%s/%s): %s" % (disruptions, query["operatorCode"],
                 query["trainid"], query["serviceType"],
-                utils.irc.color(done_count, utils.irc.COLOR_LIGHTBLUE),
+                utils.irc.color(done_count, utils.consts.LIGHTBLUE),
                 len(stations_filtered), total_count,
                 ", ".join([s["summary"] for s in stations_filtered])))