[Lxml-checkins] r41997 - in lxml/trunk/src/lxml: . tests

[scoder at codespeak.net]

Author: scoder
Date: Wed Apr 11 09:59:19 2007
New Revision: 41997

Modified:
   lxml/trunk/src/lxml/etree.pyx
   lxml/trunk/src/lxml/objectify.pyx
   lxml/trunk/src/lxml/tests/test_objectify.py
Log:
cleanups

Modified: lxml/trunk/src/lxml/etree.pyx
==============================================================================
--- lxml/trunk/src/lxml/etree.pyx	(original)
+++ lxml/trunk/src/lxml/etree.pyx	Wed Apr 11 09:59:19 2007
@@ -1924,7 +1924,7 @@
 include "dtd.pxi"        # DTD
 include "relaxng.pxi"    # RelaxNG
 include "xmlschema.pxi"  # XMLSchema
-#include "schematron.pxi" # Schematron
+#include "schematron.pxi" # Schematron (requires libxml2 2.6.21+)
 
 ################################################################################
 # Public C API

Modified: lxml/trunk/src/lxml/objectify.pyx
==============================================================================
--- lxml/trunk/src/lxml/objectify.pyx	(original)
+++ lxml/trunk/src/lxml/objectify.pyx	Wed Apr 11 09:59:19 2007
@@ -713,11 +713,11 @@
             return 0
         c_str = _cstr(text)
         if c_str[0] == c'0' or c_str[0] == c'f' or c_str[0] == c'F':
-            if c_str[1] == c'\0' or text.lower() == "false":
+            if c_str[1] == c'\0' or text == "false" or text.lower() == "false":
                 # '0' or 'f' or 'false'
                 return 0
         elif c_str[0] == c'1' or c_str[0] == c't' or c_str[0] == c'T':
-            if c_str[1] == c'\0' or text.lower() == 'true':
+            if c_str[1] == c'\0' or text == "true" or text.lower() == "true":
                 # '1' or 't' or 'true'
                 return 1
         raise ValueError, "Invalid boolean value: '%s'" % text

Modified: lxml/trunk/src/lxml/tests/test_objectify.py
==============================================================================
--- lxml/trunk/src/lxml/tests/test_objectify.py	(original)
+++ lxml/trunk/src/lxml/tests/test_objectify.py	Wed Apr 11 09:59:19 2007
@@ -710,19 +710,19 @@
 
         child_types = [ c.get(XML_SCHEMA_INSTANCE_TYPE_ATTR)
                         for c in root.iterchildren() ]
-        self.assertEquals("int",   child_types[0])
-        self.assertEquals("string",   child_types[1])
-        self.assertEquals("float", child_types[2])
-        self.assertEquals("string",   child_types[3])
-        self.assertEquals("boolean",  child_types[4])
-        self.assertEquals(None, child_types[5])
-        self.assertEquals(None,    child_types[6])
-        self.assertEquals("int", child_types[7])
-        self.assertEquals("int", child_types[8])
-        self.assertEquals("int", child_types[9])
-        self.assertEquals("string", child_types[10])
-        self.assertEquals("float", child_types[11])
-        self.assertEquals("integer", child_types[12])
+        self.assertEquals("int",      child_types[ 0])
+        self.assertEquals("string",   child_types[ 1])
+        self.assertEquals("float",    child_types[ 2])
+        self.assertEquals("string",   child_types[ 3])
+        self.assertEquals("boolean",  child_types[ 4])
+        self.assertEquals(None,       child_types[ 5])
+        self.assertEquals(None,       child_types[ 6])
+        self.assertEquals("int",      child_types[ 7])
+        self.assertEquals("int",      child_types[ 8])
+        self.assertEquals("int",      child_types[ 9])
+        self.assertEquals("string",   child_types[10])
+        self.assertEquals("float",    child_types[11])
+        self.assertEquals("integer",  child_types[12])
 
         self.assertEquals("true", root.n.get(XML_SCHEMA_NIL_ATTR))
 
@@ -754,19 +754,19 @@
 
         child_types = [ c.get(objectify.PYTYPE_ATTRIBUTE)
                         for c in root.iterchildren() ]
-        self.assertEquals("int",   child_types[0])
-        self.assertEquals("str",   child_types[1])
-        self.assertEquals("float", child_types[2])
-        self.assertEquals("str",   child_types[3])
-        self.assertEquals("bool",  child_types[4])
-        self.assertEquals("none",  child_types[5])
-        self.assertEquals(None,    child_types[6])
-        self.assertEquals("float", child_types[7])
-        self.assertEquals("float", child_types[8])
-        self.assertEquals("str", child_types[9])
-        self.assertEquals("int", child_types[10])
-        self.assertEquals("int", child_types[11])
-        self.assertEquals("int", child_types[12])
+        self.assertEquals("int",   child_types[ 0])
+        self.assertEquals("str",   child_types[ 1])
+        self.assertEquals("float", child_types[ 2])
+        self.assertEquals("str",   child_types[ 3])
+        self.assertEquals("bool",  child_types[ 4])
+        self.assertEquals("none",  child_types[ 5])
+        self.assertEquals(None,    child_types[ 6])
+        self.assertEquals("float", child_types[ 7])
+        self.assertEquals("float", child_types[ 8])
+        self.assertEquals("str",   child_types[ 9])
+        self.assertEquals("int",   child_types[10])
+        self.assertEquals("int",   child_types[11])
+        self.assertEquals("int",   child_types[12])
         
         self.assertEquals("true", root.n.get(XML_SCHEMA_NIL_ATTR))