Author: duncan
Date: Thu Jul 7 15:04:56 2005
New Revision: 14378
Added:
lxml/trunk/src/lxml/tests/test_errors.py (contents, props changed)
Modified:
lxml/trunk/CHANGES.txt (props changed)
lxml/trunk/CREDITS.txt (props changed)
lxml/trunk/INSTALL.txt (props changed)
lxml/trunk/LICENSES.txt (props changed)
lxml/trunk/Makefile (props changed)
lxml/trunk/README.txt (props changed)
lxml/trunk/TODO.txt (props changed)
lxml/trunk/doc/api.txt (props changed)
lxml/trunk/doc/compatibility.txt (props changed)
lxml/trunk/doc/intro.txt (props changed)
lxml/trunk/doc/licenses/BSD.txt (props changed)
lxml/trunk/doc/licenses/GPL.txt (props changed)
lxml/trunk/doc/licenses/ZopePublicLicense.txt (props changed)
lxml/trunk/doc/licenses/elementtree.txt (props changed)
lxml/trunk/doc/lxml.mgp (props changed)
lxml/trunk/doc/main.txt (props changed)
lxml/trunk/doc/memorymanagement.txt (props changed)
lxml/trunk/doc/test.xml (props changed)
lxml/trunk/doc/valgrind.txt (props changed)
lxml/trunk/doc/xpath.txt (props changed)
lxml/trunk/lxmldistutils.py (props changed)
lxml/trunk/samples/simple-ns.xml (contents, props changed)
lxml/trunk/samples/simple.xml (contents, props changed)
lxml/trunk/selftest.py (props changed)
lxml/trunk/selftest2.py (props changed)
lxml/trunk/setup.py (props changed)
lxml/trunk/src/doctest.py (props changed)
lxml/trunk/src/lxml/__init__.py (props changed)
lxml/trunk/src/lxml/_elementpath.py (props changed)
lxml/trunk/src/lxml/c14n.pxd (props changed)
lxml/trunk/src/lxml/cstd.pxd (props changed)
lxml/trunk/src/lxml/etree.pyx (contents, props changed)
lxml/trunk/src/lxml/relaxng.pxd (props changed)
lxml/trunk/src/lxml/tests/__init__.py (props changed)
lxml/trunk/src/lxml/tests/test.xml (props changed)
lxml/trunk/src/lxml/tests/test1.rng (props changed)
lxml/trunk/src/lxml/tests/test1.xslt (props changed)
lxml/trunk/src/lxml/tests/test2.rng (props changed)
lxml/trunk/src/lxml/tests/test2.xslt (props changed)
lxml/trunk/src/lxml/tests/test_broken.xml (props changed)
lxml/trunk/src/lxml/tests/test_etree.py (props changed)
lxml/trunk/src/lxml/tests/test_unicode.py (props changed)
lxml/trunk/src/lxml/tests/test_xinclude.xml (props changed)
lxml/trunk/src/lxml/tests/test_xpathevaluator.py (props changed)
lxml/trunk/src/lxml/tree.pxd (props changed)
lxml/trunk/src/lxml/xinclude.pxd (props changed)
lxml/trunk/src/lxml/xmlerror.pxd (props changed)
lxml/trunk/src/lxml/xmlparser.pxd (props changed)
lxml/trunk/src/lxml/xmlschema.pxd (props changed)
lxml/trunk/src/lxml/xpath.pxd (props changed)
lxml/trunk/src/lxml/xslt.pxd (props changed)
lxml/trunk/test.py (props changed)
lxml/trunk/valgrind-python.supp (props changed)
lxml/trunk/version.txt (props changed)
Log:
Added svn:eol-style:native to all text files.
Fixed an error with an uncaught exception in the Pyrex code. Added a new test
file test_errors.py to check for this (I thought there might be more similar
cases to go in the same test file, but so far I haven't found any).
Modified: lxml/trunk/samples/simple-ns.xml
==============================================================================
--- lxml/trunk/samples/simple-ns.xml (original)
+++ lxml/trunk/samples/simple-ns.xml Thu Jul 7 15:04:56 2005
@@ -1,5 +1,5 @@
-<root xmlns='namespace'>
- <element key='value'>text</element>
- <element>text</element>tail
- <empty-element/>
-</root>
+<root xmlns='namespace'>
+ <element key='value'>text</element>
+ <element>text</element>tail
+ <empty-element/>
+</root>
Modified: lxml/trunk/samples/simple.xml
==============================================================================
--- lxml/trunk/samples/simple.xml (original)
+++ lxml/trunk/samples/simple.xml Thu Jul 7 15:04:56 2005
@@ -1,5 +1,5 @@
-<root>
- <element key='value'>text</element>
- <element>text</element>tail
- <empty-element/>
-</root>
+<root>
+ <element key='value'>text</element>
+ <element>text</element>tail
+ <empty-element/>
+</root>
Modified: lxml/trunk/src/lxml/etree.pyx
==============================================================================
--- lxml/trunk/src/lxml/etree.pyx (original)
+++ lxml/trunk/src/lxml/etree.pyx Thu Jul 7 15:04:56 2005
@@ -870,7 +870,7 @@
return result
cdef xmlNode* _createElement(xmlDoc* c_doc, object tag,
- object attrib, object extra):
+ object attrib, object extra) except NULL:
cdef xmlNode* c_node
tag_utf = tag.encode('UTF-8')
if attrib is None:
@@ -1687,7 +1687,7 @@
cdef void _moveTail(xmlNode* c_tail, xmlNode* c_target):
cdef xmlNode* c_next
- # tail support: look for any text nodes trailing this node and
+ # tail support: look for any text nodes trailing this node andwe
# move them too
while c_tail is not NULL and c_tail.type == tree.XML_TEXT_NODE:
c_next = c_tail.next
@@ -1821,7 +1821,7 @@
return c_node._private is not NULL
cdef ProxyRef* createProxyRef(_NodeBase proxy, int proxy_type):
- """Create a backpointer proxy refeference for a proxy and type.
+ """Create a backpointer proxy reference for a proxy and type.
"""
cdef ProxyRef* result
result = <ProxyRef*>cstd.malloc(sizeof(ProxyRef))
@@ -1999,3 +1999,4 @@
return 0
# apparently we can deallocate all subnodes
return 1
+
Added: lxml/trunk/src/lxml/tests/test_errors.py
==============================================================================
--- (empty file)
+++ lxml/trunk/src/lxml/tests/test_errors.py Thu Jul 7 15:04:56 2005
@@ -0,0 +1,25 @@
+# -*- coding: UTF-8 -*-
+import unittest, doctest
+
+# These tests check that error handling in the Pyrex code is
+# complete.
+# It is likely that if there are errors, instead of failing the code
+# will simply crash.
+
+from lxml import etree
+
+class ErrorTestCase(unittest.TestCase):
+ etree = etree
+
+ def test_bad_element(self):
+ # attrib argument of Element() should be a dictionary, so if
+ # we pass a string we should get an error.
+ self.assertRaises(AttributeError, self.etree.Element, 'a', 'b')
+
+def test_suite():
+ suite = unittest.TestSuite()
+ suite.addTests([unittest.makeSuite(ErrorTestCase)])
+ return suite
+
+if __name__ == '__main__':
+ unittest.main()
|
