This repository was archived by the owner on May 5, 2023. It is now read-only.
forked from html5lib/html5lib-python
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathhtml5-tests.patch
More file actions
145 lines (138 loc) · 6.88 KB
/
Copy pathhtml5-tests.patch
File metadata and controls
145 lines (138 loc) · 6.88 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
Index: src/html5lib/treebuilders/dom.py
===================================================================
--- src/html5lib/treebuilders/dom.py (revision 1118)
+++ src/html5lib/treebuilders/dom.py (working copy)
@@ -137,16 +137,21 @@
rv = []
def serializeElement(element, indent=0):
if element.nodeType == Node.DOCUMENT_TYPE_NODE:
- if element.name:
- rv.append("|%s<!DOCTYPE %s>"%(' '*indent, element.name))
+ if element.publicId:
+ if element.systemId:
+ rv.append('|%s<!DOCTYPE %s PUBLIC "%s" "%s">'%(' '*indent, element.name or "", element.publicId, element.systemId))
+ else:
+ rv.append('|%s<!DOCTYPE %s PUBLIC "%s">'%(' '*indent, element.name or "", element.publicId))
+ elif element.systemId:
+ rv.append('|%s<!DOCTYPE %s SYSTEM "%s">'%(' '*indent, element.name or "", element.systemId))
else:
- rv.append("|%s<!DOCTYPE >"%(' '*indent,))
+ rv.append("|%s<!DOCTYPE %s>"%(' '*indent, element.name or ""))
elif element.nodeType == Node.DOCUMENT_NODE:
rv.append("#document")
elif element.nodeType == Node.DOCUMENT_FRAGMENT_NODE:
rv.append("#document-fragment")
elif element.nodeType == Node.COMMENT_NODE:
- rv.append("|%s<!-- %s -->"%(' '*indent, element.nodeValue))
+ rv.append("|%s<!--%s-->"%(' '*indent, element.nodeValue))
elif element.nodeType == Node.TEXT_NODE:
rv.append("|%s\"%s\"" %(' '*indent, element.nodeValue))
else:
Index: src/html5lib/treebuilders/etree.py
===================================================================
--- src/html5lib/treebuilders/etree.py (revision 1118)
+++ src/html5lib/treebuilders/etree.py (working copy)
@@ -169,7 +169,15 @@
if not(hasattr(element, "tag")):
element = element.getroot()
if element.tag == "<!DOCTYPE>":
- rv.append("|%s<!DOCTYPE %s>"%(' '*indent, element.text))
+ if element.get("publicId"):
+ if element.get("systemId"):
+ rv.append('|%s<!DOCTYPE %s PUBLIC "%s" "%s">'%(' '*indent, element.text, element.get("publicId"), element.get("systemId")))
+ else:
+ rv.append('|%s<!DOCTYPE %s PUBLIC "%s">'%(' '*indent, element.text, element.get("publicId")))
+ elif element.get("systemId"):
+ rv.append('|%s<!DOCTYPE %s SYSTEM "%s">'%(' '*indent, element.text, element.get("systemId")))
+ else:
+ rv.append("|%s<!DOCTYPE %s>"%(' '*indent, element.text))
elif element.tag == "<DOCUMENT_ROOT>":
rv.append("#document")
if element.text:
@@ -177,7 +185,7 @@
if element.tail:
finalText = element.tail
elif type(element.tag) == type(ElementTree.Comment):
- rv.append("|%s<!-- %s -->"%(' '*indent, element.text))
+ rv.append("|%s<!--%s-->"%(' '*indent, element.text))
else:
rv.append("|%s<%s>"%(' '*indent, element.tag))
if hasattr(element, "attrib"):
Index: src/html5lib/treebuilders/etree_lxml.py
===================================================================
--- src/html5lib/treebuilders/etree_lxml.py (revision 1118)
+++ src/html5lib/treebuilders/etree_lxml.py (working copy)
@@ -50,12 +50,19 @@
if not hasattr(element, "tag"):
rv.append("#document")
if element.docinfo.internalDTD:
- if not (element.docinfo.public_id or element.docinfo.system_url):
+ if element.docinfo.public_id:
+ if element.docinfo.system_url:
+ dtd_str = """<!DOCTYPE %s PUBLIC "%s" "%s">"""%(
+ element.docinfo.root_name, element.docinfo.public_id,
+ element.docinfo.system_url)
+ else:
+ dtd_str = """<!DOCTYPE %s PUBLIC "%s">"""%(
+ element.docinfo.root_name, element.docinfo.public_id)
+ elif element.docinfo.system_url:
+ dtd_str = """<!DOCTYPE %s SYSTEM "%s">"""%(
+ element.docinfo.root_name, element.docinfo.system_url)
+ else:
dtd_str = "<!DOCTYPE %s>"%element.docinfo.root_name
- else:
- dtd_str = """<!DOCTYPE %s PUBLIC "%s" "%s">"""%(
- element.docinfo.root_name, element.docinfo.public_id,
- element.docinfo.system_url)
rv.append("|%s%s"%(' '*(indent+2), dtd_str))
next_element = element.getroot()
while next_element.getprevious() is not None:
@@ -64,7 +71,7 @@
serializeElement(next_element, indent+2)
next_element = next_element.getnext()
elif type(element.tag) == type(etree.Comment):
- rv.append("|%s<!-- %s -->"%(' '*indent, element.text))
+ rv.append("|%s<!--%s-->"%(' '*indent, element.text))
else:
rv.append("|%s<%s>"%(' '*indent, element.tag))
if hasattr(element, "attrib"):
Index: src/html5lib/treebuilders/simpletree.py
===================================================================
--- src/html5lib/treebuilders/simpletree.py (revision 1118)
+++ src/html5lib/treebuilders/simpletree.py (working copy)
@@ -112,7 +112,15 @@
self.systemId = u""
def __unicode__(self):
- return u"<!DOCTYPE %s>" % self.name
+ if self.publicId:
+ if self.systemId:
+ return u'<!DOCTYPE %s PUBLIC "%s" "%s">'%(self.name, self.publicId, self.systemId)
+ else:
+ return u'<!DOCTYPE %s PUBLIC "%s">'%(self.name, self.publicId)
+ elif self.systemId:
+ return u'<!DOCTYPE %s SYSTEM "%s">'%(self.name, self.systemId)
+ else:
+ return u"<!DOCTYPE %s>"%self.name
toxml = __unicode__
@@ -186,7 +194,7 @@
self.data = data
def __unicode__(self):
- return "<!-- %s -->" % self.data
+ return u"<!--%s-->" % self.data
def toxml(self):
return "<!--%s-->" % self.data
Index: tests/support.py
===================================================================
--- tests/support.py (revision 1118)
+++ tests/support.py (working copy)
@@ -11,10 +11,10 @@
#Define the location of the tests as this changes in release versions
#RELEASE remove
-test_dir = os.path.join(os.path.pardir,os.path.pardir,'testdata')
+test_dir = os.path.join(os.path.pardir,os.path.pardir,os.path.pardir,'html5-tests')
#END RELEASE
#RELEASE add
-#test_dir = './testdata'
+#test_dir = './html5-tests'
#END RELEASE
try: