Browse Source

corrections

prieto 8 years ago
parent
commit
e42af4dfa8
1 changed files with 6 additions and 6 deletions
  1. 6
    6
      lodel/settings/settings_loader.py

+ 6
- 6
lodel/settings/settings_loader.py View File

13
     # @param conf_path str : conf.d path
13
     # @param conf_path str : conf.d path
14
     def __init__(self,conf_path):
14
     def __init__(self,conf_path):
15
         self.__conf_path=conf_path
15
         self.__conf_path=conf_path
16
-        self.__conf_sv=set()
16
+        self.__conf_sv=dict()
17
         self.__conf=self.__merge()
17
         self.__conf=self.__merge()
18
     
18
     
19
     ##@brief Lists and merges files in settings_loader.conf_path
19
     ##@brief Lists and merges files in settings_loader.conf_path
35
                     for param in config[sect]:
35
                     for param in config[sect]:
36
                         if param not in conf[sect]: 
36
                         if param not in conf[sect]: 
37
                             conf[sect][param] = config[sect][param]
37
                             conf[sect][param] = config[sect][param]
38
-                            if sect != 'DEFAULT': self.__conf_sv.add(sect + ':' + param)
38
+                            if sect != 'DEFAULT': self.__conf_sv[sect + ':' + param]=f_ini
39
                         else:
39
                         else:
40
-                            raise SettingsError("Key attribute already define : %s " % sect + ' dans '+f_ini)                        
40
+                            print(conf)
41
+                            raise SettingsError("Key attribute already defined : %s " % sect + '.' + param + ' dans ' + f_ini + ' et ' + self.__conf_sv[sect + ':' + param])                        
41
                 else:
42
                 else:
42
                     opts={}
43
                     opts={}
43
                     for key in config[sect]:
44
                     for key in config[sect]:
44
                         opts[key] = config[sect].get(key)
45
                         opts[key] = config[sect].get(key)
45
-                        if sect != 'DEFAULT': self.__conf_sv.add(sect + ':' + key)
46
+                        if sect != 'DEFAULT': self.__conf_sv[sect + ':' + key]=f_ini
46
                     conf.update({sect: opts})
47
                     conf.update({sect: opts})
47
         os.close(dir_conf)
48
         os.close(dir_conf)
48
-        print(conf)
49
         return conf
49
         return conf
50
         
50
         
51
         
51
         
63
         if keyname in sec:
63
         if keyname in sec:
64
             optionstr=sec[keyname]
64
             optionstr=sec[keyname]
65
             option=validator(sec[keyname])
65
             option=validator(sec[keyname])
66
-            self.__conf_sv.remove(section + ':' + keyname)
66
+            del self.__conf_sv[section + ':' + keyname]
67
             return option
67
             return option
68
         elif mandatory:
68
         elif mandatory:
69
              raise SettingsError("Default value mandatory for option %s" % keyname)
69
              raise SettingsError("Default value mandatory for option %s" % keyname)

Loading…
Cancel
Save