fix json syntax

diff --git a/rainbowstream/colorset/default.json b/rainbowstream/colorset/default.json
index 4e3e36a59ea09429431714eedeffde2f7c23297b..e33f9dea38ad5d60e6353386edf975a39715ddc1 100644 (file)
--- a/rainbowstream/colorset/default.json
+++ b/rainbowstream/colorset/default.json
@@ -1,23 +1,21 @@
-/*
-Default color config for rainbowstream
-Following 16 basic colors is supported:
-  default
-  black
-  red
-  green
-  yellow
-  blue
-  magenta
-  cyan
-  grey
-  light_red
-  light_green
-  light_yellow
-  light_blue
-  light_magenta
-  light_cyan
-  white
-*/
+// Default color config for rainbowstream
+// Following 16 basic colors is supported:
+//  default
+//  black
+//  red
+//  green
+//  yellow
+//  blue
+//  magenta
+//  cyan
+//  grey
+//  light_red
+//  light_green
+//  light_yellow
+//  light_blue
+//  light_magenta
+//  light_cyan
+//  white

 
 {
     "TWEET" : {
 
 {
     "TWEET" : {


@@ -27,7 +25,7 @@ Following 16 basic colors is supported:
         "favourite" : "light_green",
         "rt"        : "grey",
         "link"      : "light_cyan",
         "favourite" : "light_green",
         "rt"        : "grey",
         "link"      : "light_cyan",

-        "keyword"   : "on_light_yellow",
+        "keyword"   : "on_light_yellow"

     },
 
     "MESSAGE" : {
     },
 
     "MESSAGE" : {


@@ -35,7 +33,7 @@ Following 16 basic colors is supported:
         "recipient" : "grey",
         "to"        : "light_magenta",
         "clock"     : "grey",
         "recipient" : "grey",
         "to"        : "light_magenta",
         "clock"     : "grey",

-        "id"        : "grey",
+        "id"        : "grey"

     },
 
     "PROFILE" : {
     },
 
     "PROFILE" : {


@@ -47,11 +45,10 @@ Following 16 basic colors is supported:
         "description"       : "light_yellow",
         "location"          : "light_magenta",
         "url"               : "light_cyan",
         "description"       : "light_yellow",
         "location"          : "light_magenta",
         "url"               : "light_cyan",

-        "clock"             : "white",
+        "clock"             : "white"

     },
 
     "TREND" : {
     },
 
     "TREND" : {

-        "url": "light_cyan",
+        "url": "light_cyan"

     }
     }

-

 }
\ No newline at end of file
 }
\ No newline at end of file

diff --git a/rainbowstream/config.py b/rainbowstream/config.py
index 67dfc91fc6a6f9f0071594882cd527796b645476..409f1605c192aad5413ca3d94b79cb079e034121 100644 (file)
--- a/rainbowstream/config.py
+++ b/rainbowstream/config.py
@@ -30,7 +30,7 @@ IMAGE_SHIFT = 10
 IMAGE_MAX_HEIGHT = 40
 
 # Load colorset
 IMAGE_MAX_HEIGHT = 40
 
 # Load colorset

-default_colorset = 'colorset/default.json'
+default_colorset = 'rainbowstream/colorset/default.json'

 try:
     if os.path.exists(default_colorset):
         data = json.load(open(default_colorset))
 try:
     if os.path.exists(default_colorset):
         data = json.load(open(default_colorset))