]>
Commit | Line | Data |
---|---|---|
1 | --- lxml-2.2.6/src/lxml/html/_html5builder.py.wiget 2009-09-11 10:55:58.000000000 +0200 | |
2 | +++ lxml-2.2.6/src/lxml/html/_html5builder.py 2010-03-27 16:04:28.693916731 +0100 | |
3 | @@ -7,6 +7,11 @@ html5lib style guide. | |
4 | from html5lib.treebuilders import _base, etree as etree_builders | |
5 | from lxml import html, etree | |
6 | ||
7 | +try: | |
8 | + empty_string = unicode() | |
9 | +except NameError: | |
10 | + empty_string = str() | |
11 | + | |
12 | ||
13 | class DocumentType(object): | |
14 | ||
15 | @@ -77,7 +82,7 @@ class TreeBuilder(_base.TreeBuilder): | |
16 | self.doctype.systemId)) | |
17 | buf.append('>') | |
18 | buf.append('<html></html>') | |
19 | - root = html.fromstring(u''.join(buf)) | |
20 | + root = html.fromstring(empty_string.join(buf)) | |
21 | ||
22 | # Append the initial comments: | |
23 | for comment in self.initialComments: | |
24 | --- lxml-2.2.6/src/lxml/html/_diffcommand.py.wiget 2009-09-11 10:55:58.000000000 +0200 | |
25 | +++ lxml-2.2.6/src/lxml/html/_diffcommand.py 2010-03-27 16:02:10.727258598 +0100 | |
26 | @@ -34,7 +34,7 @@ def main(args=None): | |
27 | if options.annotation: | |
28 | return annotate(options, args) | |
29 | if len(args) != 2: | |
30 | - print 'Error: you must give two files' | |
31 | + print('Error: you must give two files') | |
32 | parser.print_help() | |
33 | sys.exit(1) | |
34 | file1, file2 = args | |
35 | @@ -82,6 +82,6 @@ def split_body(html): | |
36 | return pre, html, post | |
37 | ||
38 | def annotate(options, args): | |
39 | - print "Not yet implemented" | |
40 | + print("Not yet implemented") | |
41 | sys.exit(1) | |
42 |