gnue/gnue-common/gnue/common GConfig.py GConnec...

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/06/25 12:29:11

Modified files:
        gnue-common/gnue/common: GConfig.py GConnections.py GParser.py 

Log message:
        Bug fixes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/gnue/common/GConfig.py.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/gnue/common/GConnections.py.diff?cvsroot=OldCVS&tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/gnue/common/GParser.py.diff?cvsroot=OldCVS&tr1=1.13&tr2=1.14&r1=text&r2=text

Patches:
Index: gnue/gnue-common/gnue/common/GConfig.py
diff -u gnue/gnue-common/gnue/common/GConfig.py:1.2 
gnue/gnue-common/gnue/common/GConfig.py:1.3
--- gnue/gnue-common/gnue/common/GConfig.py:1.2 Wed Jun  6 15:45:08 2001
+++ gnue/gnue-common/gnue/common/GConfig.py     Mon Jun 25 12:29:11 2001
@@ -44,7 +44,7 @@
   global _OPTION
   return _OPTION[string.lower(varName)]
 
-class InvalidFormatError (Error):
+class InvalidFormatError (StandardError):
   # Raised if the Connections Definition File is
   # in an unreadable format.
   pass
Index: gnue/gnue-common/gnue/common/GConnections.py
diff -u gnue/gnue-common/gnue/common/GConnections.py:1.8 
gnue/gnue-common/gnue/common/GConnections.py:1.9
--- gnue/gnue-common/gnue/common/GConnections.py:1.8    Wed Jun  6 15:31:15 2001
+++ gnue/gnue-common/gnue/common/GConnections.py        Mon Jun 25 12:29:11 2001
@@ -37,12 +37,12 @@
 import GLoginHandler
 from gnue.common import openResource
 
-class NotFoundError (Error): 
+class NotFoundError (StandardError): 
   # Raised if a requested connection name does not  
   # exist in the Connections Definition File.
   pass
 
-class InvalidFormatError (Error): 
+class InvalidFormatError (StandardError): 
   # Raised if the Connections Definition File is   
   # in an unreadable format.
   pass
Index: gnue/gnue-common/gnue/common/GParser.py
diff -u gnue/gnue-common/gnue/common/GParser.py:1.13 
gnue/gnue-common/gnue/common/GParser.py:1.14
--- gnue/gnue-common/gnue/common/GParser.py:1.13        Sun Jun 10 22:16:01 2001
+++ gnue/gnue-common/gnue/common/GParser.py     Mon Jun 25 12:29:11 2001
@@ -105,7 +105,7 @@
 #
 #######################################################
 def char (value): 
-  # Do we convert '&lt;',etc stuff here
+  # Do we convert '&lt;',etc stuff here?
   return value 
 
 
@@ -117,9 +117,12 @@
 #
 #######################################################
 def bool (value): 
-  value = string.lower(string.strip(value))
-  if len(value): 
-    return not (value[0] == 'n' or value[0] == 'f' or value == '0')
+  if value == 0 or value == 1: 
+    return value
+
+  rv = string.lower(string.strip(value))
+  if len(rv): 
+    return not (rv[0] == 'n' or rv[0] == 'f' or rv == '0')
   else: 
     # This may seem counter-intuitive, but if attribute was present 
     # without a specified value, then treat as true
@@ -199,7 +202,7 @@
     
         # Pull default values for missing attributes
         if baseAttrs[attr][3] != None: 
-          attrs[attr] = baseAttrs[attr][3]
+          attrs[attr] = baseAttrs[attr][2](baseAttrs[attr][3])
 
         # Check for missing required attributes
         elif baseAttrs[attr][0]: