[Lxml-checkins] r52109 - in lxml/trunk: . doc src/lxml src/lxml/tests
scoder at codespeak.net
scoder at codespeak.net
Mon Mar 3 19:42:25 CET 2008
Author: scoder
Date: Mon Mar 3 19:42:19 2008
New Revision: 52109
Modified:
lxml/trunk/ (props changed)
lxml/trunk/CHANGES.txt
lxml/trunk/doc/api.txt
lxml/trunk/doc/extensions.txt
lxml/trunk/src/lxml/classlookup.pxi
lxml/trunk/src/lxml/lxml.objectify.pyx
lxml/trunk/src/lxml/parser.pxi
lxml/trunk/src/lxml/tests/test_classlookup.py
lxml/trunk/src/lxml/tests/test_etree.py
lxml/trunk/src/lxml/tests/test_htmlparser.py
lxml/trunk/src/lxml/tests/test_nsclasses.py
lxml/trunk/src/lxml/tests/test_xslt.py
lxml/trunk/src/lxml/xmlerror.pxi
lxml/trunk/src/lxml/xpath.pxi
lxml/trunk/src/lxml/xslt.pxi
Log:
r3700 at delle: sbehnel | 2008-03-03 12:30:47 +0100
removed most deprecated functions and methods
Modified: lxml/trunk/CHANGES.txt
==============================================================================
--- lxml/trunk/CHANGES.txt (original)
+++ lxml/trunk/CHANGES.txt Mon Mar 3 19:42:19 2008
@@ -24,6 +24,8 @@
Other changes
-------------
+* Most deprecated functions and methods were removed.
+
2.0.2 (2008-02-22)
==================
Modified: lxml/trunk/doc/api.txt
==============================================================================
--- lxml/trunk/doc/api.txt (original)
+++ lxml/trunk/doc/api.txt Mon Mar 3 19:42:19 2008
@@ -208,7 +208,7 @@
errors that occured and "might have" lead to the problem from the error log
copy attached to the exception::
- >>> etree.clearErrorLog()
+ >>> etree.clear_error_log()
>>> broken_xml = '''
... <root>
... <a>
Modified: lxml/trunk/doc/extensions.txt
==============================================================================
--- lxml/trunk/doc/extensions.txt (original)
+++ lxml/trunk/doc/extensions.txt Mon Mar 3 19:42:19 2008
@@ -176,7 +176,7 @@
register the namespace with the evaluator, however, we can access it via a
prefix::
- >>> e.registerNamespace('foo', 'http://mydomain.org/myfunctions')
+ >>> e.register_namespace('foo', 'http://mydomain.org/myfunctions')
>>> e.evaluate('/foo:a')[0].tag
'{http://mydomain.org/myfunctions}a'
Modified: lxml/trunk/src/lxml/classlookup.pxi
==============================================================================
--- lxml/trunk/src/lxml/classlookup.pxi (original)
+++ lxml/trunk/src/lxml/classlookup.pxi Mon Mar 3 19:42:19 2008
@@ -107,13 +107,6 @@
"""
self._setFallback(lookup)
- def setFallback(self, ElementClassLookup lookup not None):
- """Sets the fallback scheme for this lookup method.
-
- :deprecated: use ``set_fallback()`` instead.
- """
- self._setFallback(lookup)
-
cdef object _callFallback(self, _Document doc, xmlNode* c_node):
return self._fallback_function(self.fallback, doc, c_node)
@@ -408,10 +401,6 @@
ELEMENT_CLASS_LOOKUP_STATE = state
LOOKUP_ELEMENT_CLASS = function
-def setElementClassLookup(ElementClassLookup lookup = None):
- ":deprecated: use ``set_element_class_lookup(lookup)`` instead"
- set_element_class_lookup(lookup)
-
def set_element_class_lookup(ElementClassLookup lookup = None):
"""set_element_class_lookup(lookup = None)
Modified: lxml/trunk/src/lxml/lxml.objectify.pyx
==============================================================================
--- lxml/trunk/src/lxml/lxml.objectify.pyx (original)
+++ lxml/trunk/src/lxml/lxml.objectify.pyx Mon Mar 3 19:42:19 2008
@@ -81,11 +81,6 @@
PYTYPE_ATTRIBUTE = cetree.namespacedNameFromNsName(
_PYTYPE_NAMESPACE, _PYTYPE_ATTRIBUTE_NAME)
-def setPytypeAttributeTag(attribute_tag=None):
- """:deprecated: use ``set_pytype_attribute_tag()`` instead.
- """
- set_pytype_attribute_tag(attribute_tag)
-
set_pytype_attribute_tag()
@@ -1685,10 +1680,6 @@
cdef object objectify_parser
objectify_parser = __DEFAULT_PARSER
-def setDefaultParser(new_parser = None):
- ":deprecated: use ``set_default_parser()`` instead."
- set_default_parser(new_parser)
-
def set_default_parser(new_parser = None):
"""set_default_parser(new_parser = None)
Modified: lxml/trunk/src/lxml/parser.pxi
==============================================================================
--- lxml/trunk/src/lxml/parser.pxi (original)
+++ lxml/trunk/src/lxml/parser.pxi Mon Mar 3 19:42:19 2008
@@ -678,7 +678,7 @@
return "libxml2 %d.%d.%d" % LIBXML_VERSION
def setElementClassLookup(self, ElementClassLookup lookup = None):
- "@deprecated: use ``parser.set_element_class_lookup(lookup)`` instead."
+ ":deprecated: use ``parser.set_element_class_lookup(lookup)`` instead."
self.set_element_class_lookup(lookup)
def set_element_class_lookup(self, ElementClassLookup lookup = None):
@@ -1130,14 +1130,6 @@
__GLOBAL_PARSER_CONTEXT.setDefaultParser(__DEFAULT_XML_PARSER)
-def setDefaultParser(parser=None):
- ":deprecated: please use set_default_parser instead."
- set_default_parser(parser)
-
-def getDefaultParser():
- ":deprecated: please use get_default_parser instead."
- return get_default_parser()
-
def set_default_parser(_BaseParser parser=None):
"""set_default_parser(parser=None)
Modified: lxml/trunk/src/lxml/tests/test_classlookup.py
==============================================================================
--- lxml/trunk/src/lxml/tests/test_classlookup.py (original)
+++ lxml/trunk/src/lxml/tests/test_classlookup.py Mon Mar 3 19:42:19 2008
@@ -25,7 +25,7 @@
etree = etree
def tearDown(self):
- etree.setElementClassLookup()
+ etree.set_element_class_lookup()
super(ClassLookupTestCase, self).tearDown()
def test_namespace_lookup(self):
@@ -33,7 +33,7 @@
FIND_ME = "namespace class"
lookup = etree.ElementNamespaceClassLookup()
- etree.setElementClassLookup(lookup)
+ etree.set_element_class_lookup(lookup)
ns = lookup.get_namespace("myNS")
ns[None] = TestElement
@@ -57,7 +57,7 @@
lookup = etree.ElementDefaultClassLookup(
element=TestElement, comment=TestComment, pi=TestPI)
- parser.setElementClassLookup(lookup)
+ parser.set_element_class_lookup(lookup)
root = etree.XML("""<?xml version='1.0'?>
<root>
@@ -78,7 +78,7 @@
lookup = etree.AttributeBasedElementClassLookup(
"a1", class_dict)
- etree.setElementClassLookup(lookup)
+ etree.set_element_class_lookup(lookup)
root = etree.XML(xml_str)
self.assertFalse(hasattr(root, 'FIND_ME'))
@@ -95,7 +95,7 @@
if name == 'c1':
return TestElement
- etree.setElementClassLookup( MyLookup() )
+ etree.set_element_class_lookup( MyLookup() )
root = etree.XML(xml_str)
self.assertFalse(hasattr(root, 'FIND_ME'))
@@ -116,7 +116,7 @@
return TestElement1
lookup = etree.ElementNamespaceClassLookup( MyLookup() )
- etree.setElementClassLookup(lookup)
+ etree.set_element_class_lookup(lookup)
ns = lookup.get_namespace("otherNS")
ns[None] = TestElement2
@@ -134,14 +134,14 @@
FIND_ME = "parser_based"
lookup = etree.ParserBasedElementClassLookup()
- etree.setElementClassLookup(lookup)
+ etree.set_element_class_lookup(lookup)
class MyLookup(etree.CustomElementClassLookup):
def lookup(self, t, d, ns, name):
return TestElement
parser = etree.XMLParser()
- parser.setElementClassLookup( MyLookup() )
+ parser.set_element_class_lookup( MyLookup() )
root = etree.parse(StringIO(xml_str), parser).getroot()
self.assertEquals(root.FIND_ME,
Modified: lxml/trunk/src/lxml/tests/test_etree.py
==============================================================================
--- lxml/trunk/src/lxml/tests/test_etree.py (original)
+++ lxml/trunk/src/lxml/tests/test_etree.py Mon Mar 3 19:42:19 2008
@@ -254,7 +254,7 @@
parse = self.etree.parse
# from StringIO
f = StringIO('<a><b></c></b></a>')
- self.etree.clearErrorLog()
+ self.etree.clear_error_log()
try:
parse(f)
logs = None
Modified: lxml/trunk/src/lxml/tests/test_htmlparser.py
==============================================================================
--- lxml/trunk/src/lxml/tests/test_htmlparser.py (original)
+++ lxml/trunk/src/lxml/tests/test_htmlparser.py Mon Mar 3 19:42:19 2008
@@ -27,7 +27,7 @@
def tearDown(self):
super(HtmlParserTestCase, self).tearDown()
- self.etree.setDefaultParser()
+ self.etree.set_default_parser()
def test_module_HTML(self):
element = self.etree.HTML(self.html_str)
@@ -235,13 +235,13 @@
self.assertRaises(self.etree.XMLSyntaxError,
self.etree.parse, StringIO(self.broken_html_str))
- self.etree.setDefaultParser( self.etree.HTMLParser() )
+ self.etree.set_default_parser( self.etree.HTMLParser() )
tree = self.etree.parse(StringIO(self.broken_html_str))
self.assertEqual(self.etree.tostring(tree.getroot()),
self.html_str)
- self.etree.setDefaultParser()
+ self.etree.set_default_parser()
self.assertRaises(self.etree.XMLSyntaxError,
self.etree.parse, StringIO(self.broken_html_str))
Modified: lxml/trunk/src/lxml/tests/test_nsclasses.py
==============================================================================
--- lxml/trunk/src/lxml/tests/test_nsclasses.py (original)
+++ lxml/trunk/src/lxml/tests/test_nsclasses.py Mon Mar 3 19:42:19 2008
@@ -25,11 +25,11 @@
lookup = etree.ElementNamespaceClassLookup()
self.Namespace = lookup.get_namespace
parser = etree.XMLParser()
- parser.setElementClassLookup(lookup)
- etree.setDefaultParser(parser)
+ parser.set_element_class_lookup(lookup)
+ etree.set_default_parser(parser)
def tearDown(self):
- etree.setDefaultParser()
+ etree.set_default_parser()
del self.Namespace
super(ETreeNamespaceClassesTestCase, self).tearDown()
Modified: lxml/trunk/src/lxml/tests/test_xslt.py
==============================================================================
--- lxml/trunk/src/lxml/tests/test_xslt.py (original)
+++ lxml/trunk/src/lxml/tests/test_xslt.py Mon Mar 3 19:42:19 2008
@@ -29,7 +29,7 @@
<?xml version="1.0"?>
<foo>B</foo>
''',
- st.tostring(res))
+ str(res))
def test_xslt_elementtree_error(self):
self.assertRaises(ValueError, etree.XSLT, etree.ElementTree())
@@ -298,7 +298,7 @@
<?xml version="1.0"?>
<foo>Bar</foo>
''',
- st.tostring(res))
+ str(res))
if etree.LIBXSLT_VERSION < (1,1,18):
# later versions produce no error
@@ -335,7 +335,7 @@
<?xml version="1.0"?>
<foo>Bar</foo><foo>Baz</foo>
''',
- st.tostring(res))
+ str(res))
def test_xslt_parameter_xpath(self):
tree = self.parse('<a><b>B</b><c>C</c></a>')
@@ -354,7 +354,7 @@
<?xml version="1.0"?>
<foo>B</foo>
''',
- st.tostring(res))
+ str(res))
def test_xslt_default_parameters(self):
@@ -375,13 +375,13 @@
<?xml version="1.0"?>
<foo>Bar</foo>
''',
- st.tostring(res))
+ str(res))
res = st.apply(tree)
self.assertEquals('''\
<?xml version="1.0"?>
<foo>Default</foo>
''',
- st.tostring(res))
+ str(res))
def test_xslt_html_output(self):
tree = self.parse('<a><b>B</b><c>C</c></a>')
@@ -471,7 +471,6 @@
styledoc = self.parse(xslt)
style = etree.XSLT(styledoc)
result = style.apply(source)
- self.assertEqual('', style.tostring(result))
self.assertEqual('', str(result))
def test_xslt_message(self):
@@ -488,7 +487,6 @@
styledoc = self.parse(xslt)
style = etree.XSLT(styledoc)
result = style.apply(source)
- self.assertEqual('', style.tostring(result))
self.assertEqual('', str(result))
self.assert_("TEST TEST TEST" in [entry.message
for entry in style.error_log])
@@ -507,7 +505,6 @@
styledoc = self.parse(xslt)
style = etree.XSLT(styledoc)
result = style.apply(source)
- self.assertEqual('', style.tostring(result))
self.assertEqual('', str(result))
self.assert_("TEST TEST TEST" in [entry.message
for entry in style.error_log])
@@ -907,7 +904,7 @@
<?xml version="1.0"?>
<foo>B</foo>
''',
- st.tostring(res))
+ str(res))
def test_xslt_pi_embedded_id(self):
# test XPath lookup mechanism
@@ -941,7 +938,7 @@
<?xml version="1.0"?>
<foo>B</foo>
''',
- st.tostring(res))
+ str(res))
def test_xslt_pi_get(self):
tree = self.parse('''\
Modified: lxml/trunk/src/lxml/xmlerror.pxi
==============================================================================
--- lxml/trunk/src/lxml/xmlerror.pxi (original)
+++ lxml/trunk/src/lxml/xmlerror.pxi Mon Mar 3 19:42:19 2008
@@ -12,14 +12,6 @@
"""
__GLOBAL_ERROR_LOG.clear()
-def clearErrorLog():
- """Clear the global error log. Note that this log is already bound to a
- fixed size.
-
- :deprecated: use ``clear_error_log()`` instead.
- """
- __GLOBAL_ERROR_LOG.clear()
-
# dummy function: no debug output at all
cdef void _nullGenericErrorFunc(void* ctxt, char* msg, ...):
pass
@@ -411,17 +403,6 @@
"Helper function for properties in exceptions."
return __GLOBAL_ERROR_LOG.copy()
-def useGlobalPythonLog(PyErrorLog log not None):
- """Replace the global error log by an etree.PyErrorLog that uses the
- standard Python logging package.
-
- Note that this disables access to the global error log from exceptions.
- Parsers, XSLT etc. will continue to provide their normal local error log.
-
- :deprecated: use ``use_global_python_log()`` instead.
- """
- use_global_python_log(log)
-
def use_global_python_log(PyErrorLog log not None):
"""use_global_python_log(log)
Modified: lxml/trunk/src/lxml/xpath.pxi
==============================================================================
--- lxml/trunk/src/lxml/xpath.pxi (original)
+++ lxml/trunk/src/lxml/xpath.pxi Mon Mar 3 19:42:19 2008
@@ -235,26 +235,11 @@
python.PyErr_NoMemory()
self.set_context(xpathCtxt)
- def registerNamespace(self, prefix, uri):
- """Register a namespace with the XPath context.
-
- :deprecated: use ``register_namespace()`` instead
- """
- self._context.addNamespace(prefix, uri)
-
def register_namespace(self, prefix, uri):
"""Register a namespace with the XPath context.
"""
self._context.addNamespace(prefix, uri)
- def registerNamespaces(self, namespaces):
- """Register a prefix -> uri dict.
-
- :deprecated: use ``register_namespaces()`` instead
- """
- for prefix, uri in namespaces.items():
- self._context.addNamespace(prefix, uri)
-
def register_namespaces(self, namespaces):
"""Register a prefix -> uri dict.
"""
Modified: lxml/trunk/src/lxml/xslt.pxi
==============================================================================
--- lxml/trunk/src/lxml/xslt.pxi (original)
+++ lxml/trunk/src/lxml/xslt.pxi Mon Mar 3 19:42:19 2008
@@ -387,15 +387,6 @@
:deprecated: call the object, not this method."""
return self(_input, profile_run=profile_run, **_kw)
- def tostring(self, _ElementTree result_tree):
- """tostring(self, result_tree)
-
- Save result doc to string based on stylesheet output method.
-
- :deprecated: use str(result_tree) instead.
- """
- return str(result_tree)
-
def __deepcopy__(self, memo):
return self.__copy__()
More information about the lxml-checkins
mailing list