merged from develop

2017-08-13 17:07:36 +02:00
parent ebda6babdd
commit ed553f5cae
398 changed files with 10399 additions and 2029 deletions
@@ -5,9 +5,8 @@

 import os

-import config
 import jsontools
-import logger
+from platformcode import config, logger

 DEFAULT_UPDATE_URL = "/channels/"
 dict_channels_parameters = dict()
@@ -18,9 +17,12 @@ def is_adult(channel_name):
    channel_parameters = get_channel_parameters(channel_name)
    return channel_parameters["adult"]

+
 def is_enabled(channel_name):
    logger.info("channel_name=" + channel_name)
-    return get_channel_parameters(channel_name)["active"] and get_channel_setting("enabled", channel = channel_name, default = True)
+    return get_channel_parameters(channel_name)["active"] and get_channel_setting("enabled", channel=channel_name,
+                                                                                  default=True)
+

 def get_channel_parameters(channel_name):
    global dict_channels_parameters