[Checkins] SVN: z3c.etestbrowser/trunk/ Updgrade pacakge to lxml 2.2 or greater and get ready for release.
Stephan Richter
srichter at gmail.com
Thu Jul 23 14:16:03 EDT 2009
Log message for revision 102166:
Updgrade pacakge to lxml 2.2 or greater and get ready for release.
Changed:
U z3c.etestbrowser/trunk/CHANGES.txt
U z3c.etestbrowser/trunk/buildout.cfg
U z3c.etestbrowser/trunk/setup.py
U z3c.etestbrowser/trunk/src/z3c/etestbrowser/README.txt
U z3c.etestbrowser/trunk/src/z3c/etestbrowser/testing.py
-=-
Modified: z3c.etestbrowser/trunk/CHANGES.txt
===================================================================
--- z3c.etestbrowser/trunk/CHANGES.txt 2009-07-23 17:46:29 UTC (rev 102165)
+++ z3c.etestbrowser/trunk/CHANGES.txt 2009-07-23 18:16:03 UTC (rev 102166)
@@ -2,14 +2,16 @@
CHANGES
=======
-1.3 (unreleased)
-----------------
+1.3.0 (2009-07-23)
+------------------
+- Updgraded pacakge to lxml 2.2.
+
- Fixed bug with `normalized_contents` which would break the `open` function
of test browser if content wasn't parsable as HTML/XML.
-1.2 (2008-05-29)
-----------------
+1.2.0 (2008-05-29)
+------------------
- Added `normalized_contents` attribute that reindents and normalizes the
etree structure of a document and allows easier to read HTML/XML examples in
Modified: z3c.etestbrowser/trunk/buildout.cfg
===================================================================
--- z3c.etestbrowser/trunk/buildout.cfg 2009-07-23 17:46:29 UTC (rev 102165)
+++ z3c.etestbrowser/trunk/buildout.cfg 2009-07-23 18:16:03 UTC (rev 102166)
@@ -1,11 +1,7 @@
[buildout]
develop = .
parts = test
-versions = versions
[test]
recipe = zc.recipe.testrunner
eggs = z3c.etestbrowser [test]
-
-[versions]
-lxml = 1.3.6
Modified: z3c.etestbrowser/trunk/setup.py
===================================================================
--- z3c.etestbrowser/trunk/setup.py 2009-07-23 17:46:29 UTC (rev 102165)
+++ z3c.etestbrowser/trunk/setup.py 2009-07-23 18:16:03 UTC (rev 102166)
@@ -22,7 +22,7 @@
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
setup(name='z3c.etestbrowser',
- version = '1.3dev',
+ version = '1.3.0',
author='Christian Theune',
author_email='ct at gocept.com',
description='Extensions for zope.testbrowser',
@@ -52,7 +52,7 @@
'zope.app.securitypolicy',
'zope.app.server']),
install_requires=['setuptools',
- 'lxml',
+ 'lxml>=2.2',
'zope.testbrowser'
],
include_package_data = True,
Modified: z3c.etestbrowser/trunk/src/z3c/etestbrowser/README.txt
===================================================================
--- z3c.etestbrowser/trunk/src/z3c/etestbrowser/README.txt 2009-07-23 17:46:29 UTC (rev 102165)
+++ z3c.etestbrowser/trunk/src/z3c/etestbrowser/README.txt 2009-07-23 18:16:03 UTC (rev 102166)
@@ -49,7 +49,7 @@
>>> browser.etree
<Element {http://www.w3.org/1999/xhtml}html at ...>
>>> browser.etree.xpath(
- ... '//html:body', {'html': 'http://www.w3.org/1999/xhtml'})
+ ... '//html:body', namespaces={'html': 'http://www.w3.org/1999/xhtml'})
[<Element {http://www.w3.org/1999/xhtml}body at ...>]
LXML unicode support
Modified: z3c.etestbrowser/trunk/src/z3c/etestbrowser/testing.py
===================================================================
--- z3c.etestbrowser/trunk/src/z3c/etestbrowser/testing.py 2009-07-23 17:46:29 UTC (rev 102165)
+++ z3c.etestbrowser/trunk/src/z3c/etestbrowser/testing.py 2009-07-23 18:16:03 UTC (rev 102166)
@@ -21,7 +21,7 @@
import htmllib
import formatter
-import lxml.etree
+import lxml.etree, lxml.html
import zope.testbrowser.testing
@@ -66,9 +66,11 @@
# I'm not using any internal knowledge about testbrowser
# here, to avoid breakage. Memory usage won't be a problem.
if self.xml_strict:
- self._etree = lxml.etree.XML(self.contents)
+ self._etree = lxml.etree.fromstring(
+ self.contents,
+ parser=lxml.etree.XMLParser(resolve_entities=False))
else:
- # This is a workaround against the broken fallback for
+ # This is a workaround against the broken fallback for
# encoding detection of libxml2.
# We have a chance of knowing the encoding as Zope states this in
# the content-type response header.
@@ -86,8 +88,8 @@
def normalized_contents(self):
if self._normalized_contents is None:
indent(self.etree)
- self._normalized_contents = lxml.etree.tostring(self.etree,
- pretty_print=True)
+ self._normalized_contents = lxml.etree.tostring(
+ self.etree, pretty_print=True)
return self._normalized_contents
def _changed(self):
More information about the Checkins
mailing list