check if None

[rainbowstream.git] / rainbowstream / config.py

diff --git a/rainbowstream/config.py b/rainbowstream/config.py
index 4b4aef6fbc44bd15dc587067d9c584361b13c71e..828a51710a6cbfccd740274e88f9969ba7b0fee4 100644 (file)
--- a/rainbowstream/config.py
+++ b/rainbowstream/config.py
@@ -29,14 +29,15 @@ def load_config(filepath):
         return json.loads(content)
     except IOError:
         db.theme_store('default')
         return json.loads(content)
     except IOError:
         db.theme_store('default')

-        pass
+        return None

 
 # Load default colorset
 c = {}
 default_config = 'rainbowstream/colorset/default.json'
 data = load_config(default_config)
 
 # Load default colorset
 c = {}
 default_config = 'rainbowstream/colorset/default.json'
 data = load_config(default_config)

-for d in data:
-    c[d] = data[d]
+if data:
+    for d in data:
+        c[d] = data[d]

 # Load user's colorset
 rainbow_config = os.environ.get(
     'HOME',
 # Load user's colorset
 rainbow_config = os.environ.get(
     'HOME',


@@ -44,5 +45,6 @@ rainbow_config = os.environ.get(
         'USERPROFILE',
         '')) + os.sep + '.rainbow_config.json'
 data = load_config(rainbow_config)
         'USERPROFILE',
         '')) + os.sep + '.rainbow_config.json'
 data = load_config(rainbow_config)

-for d in data:
-    c[d] = data[d]
+if data:
+    for d in data:
+        c[d] = data[d]