summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremkael <emkael@tlen.pl>2018-02-21 15:06:57 +0100
committeremkael <emkael@tlen.pl>2018-02-21 15:06:57 +0100
commit2ccb3a3fa87627b9a2681905550e52db7e259ab0 (patch)
tree1ff1bdb2dbf112b9959bb15fb466373388cfd331
parent40d83dcfafe9c3556d961a158aaa6e73b587f238 (diff)
?
-rw-r--r--jfr_playoff/settings.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/jfr_playoff/settings.py b/jfr_playoff/settings.py
index c95cf44..31b29e7 100644
--- a/jfr_playoff/settings.py
+++ b/jfr_playoff/settings.py
@@ -26,9 +26,10 @@ class PlayoffSettings(object):
overwrite=True):
try:
print locals()
- remote_file = urllib.urlopen(remote_url)
- remote_content = remote_file.read().decode('utf-8-sig')
- remote_config = json.loads(remote_content)
+ if remote_url is not None:
+ remote_file = urllib.urlopen(remote_url)
+ remote_content = remote_file.read().decode('utf-8-sig')
+ remote_config = json.loads(remote_content)
remote_config = new_config if new_config is not None else json.loads(remote_content)
for key, value in remote_config.iteritems():
if (key not in base_config) or overwrite: