[yum-cvs] yum/yum config.py,1.59,1.60 constants.py,1.3,1.4

[Seth Vidal]

Update of /home/groups/yum/cvs/yum/yum
In directory login:/tmp/cvs-serv26042

Modified Files:
	config.py constants.py 
Log Message:
add BOOLEAN_STATES to constants, use it in config.py



Index: config.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/config.py,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- config.py	27 Mar 2005 21:53:29 -0000	1.59
+++ config.py	27 Mar 2005 22:01:23 -0000	1.60
@@ -32,6 +32,7 @@
 import urlgrabber
 import urlgrabber.grabber
 from repos import variableReplace, Repository
+from constants import *
 
 
 class CFParser(ConfigParser.ConfigParser):
@@ -286,15 +287,13 @@
             setattr(self, option, value)
             
         # do the bools
-        self._boolean_states = {'1': True, 'yes': True, 'true': True, 'on': True,
-                           '0': False, 'no': False, 'false': False, 'off': False}
         
         for (option, default) in optionbools:
             value = self.cfg._getoption('main', option, default)
             value = variableReplace(self.yumvar, value)
-            if value.lower() not in self._boolean_states:
+            if value.lower() not in BOOLEAN_STATES:
                 raise Errors.ConfigError, 'Invalid value in config for main::%s' % option
-            value = self._boolean_states[value.lower()]
+            value = BOOLEAN_STATES[value.lower()]
             self.configdata[option] = value
             setattr(self, option, value)
             
@@ -437,9 +436,9 @@
         val = cfgparser._getoption(section, keyword, yumconfig.getConfigOption(keyword))
         val = variableReplace(yumconfig.yumvar, val)
         if type(val) is not types.BooleanType:
-            if val.lower() not in yumconfig._boolean_states:
+            if val.lower() not in BOOLEAN_STATES:
                 raise Errors.RepoError, 'Invalid value in repo config for %s::%s' % (section, keyword)
-            val = yumconfig._boolean_states[val.lower()]
+            val = BOOLEAN_STATES[val.lower()]
         thisrepo.set(keyword, val)
     
     for (keyword, getfunc) in [('bandwidth', cfgparser.getbytes),

Index: constants.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/constants.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- constants.py	27 Mar 2005 03:21:57 -0000	1.3
+++ constants.py	27 Mar 2005 22:01:23 -0000	1.4
@@ -49,3 +49,6 @@
 PLUG_OPT_WHERE_REPO = 1
 PLUG_OPT_WHERE_ALL = 2
 
+# boolean dict:
+BOOLEAN_STATES = {'1': True, 'yes': True, 'true': True, 'on': True,
+                  '0': False, 'no': False, 'false': False, 'off': False}