Config model refactoring #2

evgeniygroznykh · Sep 23, 2020 · ec974f0 · ec974f0
1 parent 33fd1eb
commit ec974f0
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/cfg/config.py b/cfg/config.py
@@ -14,13 +14,13 @@ def getConfigAsJson():
     except FileNotFoundError as exc:
         logFileNotFoundErrorAndReraise()
 
-def getGlobalConfigSettingsNames(json_config):
-	return [setting_name for setting_name in json_config.keys()]
+def representConfigValuesAsDict(json_config):
+	def getGlobalConfigSettingsNames(json_config):
+		return [setting_name for setting_name in json_config.keys()]
 
-def getGlobalConfigValues(json_config):
-	return [config_value for config_value in json_config.values()]
+	def getGlobalConfigValues(json_config):
+		return [config_value for config_value in json_config.values()]
 
-def representConfigValuesAsDict(config_settings_names, config_values):
-	return { k:v for k in config_settings_names for v in global_config_values } 
+	return { k:v for k in getGlobalConfigSettingsNames(json_config) for v in getGlobalConfigValues(json_config) }