Author: pjenvey
Date: 2008-03-04 18:37:52 -0700 (Tue, 04 Mar 2008)
New Revision: 3296
Modified:
FormEncode/trunk/formencode/doctest_xml_compare.py
FormEncode/trunk/formencode/htmlgen.py
FormEncode/trunk/tests/test_doctest_xml_compare.py
FormEncode/trunk/tests/test_htmlfill.py
Log:
use builtin elementtree if available
Modified: FormEncode/trunk/formencode/doctest_xml_compare.py
===================================================================
--- FormEncode/trunk/formencode/doctest_xml_compare.py 2008-03-04 19:01:46 UTC
(rev 3295)
+++ FormEncode/trunk/formencode/doctest_xml_compare.py 2008-03-05 01:37:52 UTC
(rev 3296)
@@ -3,7 +3,10 @@
doctest.OutputChecker
except AttributeError:
import util.doctest24 as doctest
-import elementtree.ElementTree as et
+try:
+ import xml.etree.ElementTree as ET
+except ImportError:
+ import elementtree.ElementTree as ET
from xml.parsers.expat import ExpatError as XMLParseError
RealOutputChecker = doctest.OutputChecker
@@ -111,12 +114,12 @@
return (t1 or '').strip() == (t2 or '').strip()
def make_xml(s):
- return et.XML('<xml>%s</xml>' % s)
+ return ET.XML('<xml>%s</xml>' % s)
def make_string(xml):
if isinstance(xml, (str, unicode)):
xml = make_xml(xml)
- s = et.tostring(xml)
+ s = ET.tostring(xml)
if s == '<xml />':
return ''
assert s.startswith('<xml>') and s.endswith('</xml>'), repr(s)
Modified: FormEncode/trunk/formencode/htmlgen.py
===================================================================
--- FormEncode/trunk/formencode/htmlgen.py 2008-03-04 19:01:46 UTC (rev
3295)
+++ FormEncode/trunk/formencode/htmlgen.py 2008-03-05 01:37:52 UTC (rev
3296)
@@ -59,7 +59,10 @@
from __future__ import generators
from cgi import escape
-import elementtree.ElementTree as et
+try:
+ import xml.etree.ElementTree as ET
+except ImportError:
+ import elementtree.ElementTree as ET
default_encoding = 'utf-8'
@@ -74,7 +77,7 @@
if attr.find('__') != -1:
attr = attr.replace('__', ':')
if attr == 'comment':
- return Element(et.Comment, {})
+ return Element(ET.Comment, {})
else:
return Element(attr, {})
@@ -102,7 +105,7 @@
html = _HTML()
-class Element(et._ElementInterface):
+class Element(ET._ElementInterface):
def __call__(self, *args, **kw):
el = self.__class__(self.tag, self.attrib)
@@ -136,7 +139,7 @@
for arg in flatten(args):
if arg is None:
continue
- if not et.iselement(arg):
+ if not ET.iselement(arg):
if last is None:
if el.text is None:
el.text = unicode(arg)
@@ -153,7 +156,7 @@
return el
def __str__(self):
- return et.tostring(self, default_encoding)
+ return ET.tostring(self, default_encoding)
def __unicode__(self):
# This is lame!
Modified: FormEncode/trunk/tests/test_doctest_xml_compare.py
===================================================================
--- FormEncode/trunk/tests/test_doctest_xml_compare.py 2008-03-04 19:01:46 UTC
(rev 3295)
+++ FormEncode/trunk/tests/test_doctest_xml_compare.py 2008-03-05 01:37:52 UTC
(rev 3296)
@@ -2,8 +2,8 @@
from formencode.htmlgen import html
import sys
-XML = dxml.et.XML
-tostring = dxml.et.tostring
+XML = dxml.ET.XML
+tostring = dxml.ET.tostring
def test_xml_compare():
t1 = XML('<test />')
Modified: FormEncode/trunk/tests/test_htmlfill.py
===================================================================
--- FormEncode/trunk/tests/test_htmlfill.py 2008-03-04 19:01:46 UTC (rev
3295)
+++ FormEncode/trunk/tests/test_htmlfill.py 2008-03-05 01:37:52 UTC (rev
3296)
@@ -10,9 +10,12 @@
sys.path.insert(0, base_dir)
from formencode import htmlfill
from formencode.doctest_xml_compare import xml_compare
-from elementtree import ElementTree as et
from xml.parsers.expat import ExpatError
from formencode import htmlfill_schemabuilder
+try:
+ import xml.etree.ElementTree as ET
+except ImportError:
+ import elementtree.ElementTree as ET
def test_inputoutput():
data_dir = os.path.join(os.path.dirname(__file__), 'htmlfill_data')
@@ -57,8 +60,8 @@
def reporter(v):
print v
try:
- output_xml = et.XML(output)
- expected_xml = et.XML(expected)
+ output_xml = ET.XML(output)
+ expected_xml = ET.XML(expected)
except ExpatError:
comp = output.strip() == expected.strip()
else:
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
FormEncode-CVS mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/formencode-cvs
