[Lxml-checkins] r33855 - in lxml/branch/lxml-1.1: . src/lxml src/lxml/tests

[scoder at codespeak.net]

Author: scoder
Date: Sun Oct 29 19:31:11 2006
New Revision: 33855

Modified:
   lxml/branch/lxml-1.1/setup.py
   lxml/branch/lxml-1.1/src/lxml/parser.pxi
   lxml/branch/lxml-1.1/src/lxml/tests/test_io.py
   lxml/branch/lxml-1.1/src/lxml/tree.pxd
Log:
cleanups merged from trunk

Modified: lxml/branch/lxml-1.1/setup.py
==============================================================================
--- lxml/branch/lxml-1.1/setup.py	(original)
+++ lxml/branch/lxml-1.1/setup.py	Sun Oct 29 19:31:11 2006
@@ -137,8 +137,8 @@
 except ValueError:
     pass
 
-if '--debug' in sys.argv:
-    sys.argv.remove('--debug')
+if '--debug-gcc' in sys.argv:
+    sys.argv.remove('--debug-gcc')
     cflags.append('-g2')
 
 ext_modules = []

Modified: lxml/branch/lxml-1.1/src/lxml/parser.pxi
==============================================================================
--- lxml/branch/lxml-1.1/src/lxml/parser.pxi	(original)
+++ lxml/branch/lxml-1.1/src/lxml/parser.pxi	Sun Oct 29 19:31:11 2006
@@ -388,7 +388,7 @@
         if self._parser_ctxt is not NULL:
             xmlparser.xmlFreeParserCtxt(self._parser_ctxt)
 
-    def _cleanup(self):
+    cdef void _cleanup(self):
         cdef xmlParserCtxt* pctxt
         pctxt = self._parser_ctxt
         if pctxt is not NULL:

Modified: lxml/branch/lxml-1.1/src/lxml/tests/test_io.py
==============================================================================
--- lxml/branch/lxml-1.1/src/lxml/tests/test_io.py	(original)
+++ lxml/branch/lxml-1.1/src/lxml/tests/test_io.py	Sun Oct 29 19:31:11 2006
@@ -53,7 +53,7 @@
         # parse from filename
         
         filename = tempfile.mktemp(suffix=".xml")
-        os.write(handle, self.root_str)
+        open(filename, 'wb').write(self.root_str)
         try:
             tree = self.etree.ElementTree()
             root = tree.parse(filename)
@@ -63,7 +63,7 @@
 
     def test_class_parse_filename_remove_previous(self):
         filename = tempfile.mktemp(suffix=".xml")
-        os.write(handle, self.root_str)
+        open(filename, 'wb').write(self.root_str)
         try:
             tree = self.etree.ElementTree()
             root = tree.parse(filename)

Modified: lxml/branch/lxml-1.1/src/lxml/tree.pxd
==============================================================================
--- lxml/branch/lxml-1.1/src/lxml/tree.pxd	(original)
+++ lxml/branch/lxml-1.1/src/lxml/tree.pxd	Sun Oct 29 19:31:11 2006
@@ -1,4 +1,4 @@
-from cstd cimport FILE
+from cstd cimport FILE, size_t
 
 cdef extern from "lxml-version.h":
     cdef char* LXML_VERSION_STRING
@@ -255,6 +255,9 @@
 cdef extern from "libxml/xmlstring.h":
     cdef char* xmlStrdup(char* cur)
 
+cdef extern from "libxml/xmlmemory.h":
+    cdef void* xmlMalloc(size_t size)
+
 cdef extern from "etree_defs.h":
     cdef int _isElement(xmlNode* node)
     cdef char* _getNs(xmlNode* node)