Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

A first attempt at fixing #100 (method dispatcher duplicates)#108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Closed
Closed
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
170 changes: 86 additions & 84 deletionshtml5lib/html5parser.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -649,8 +649,8 @@ def __init__(self, parser, tree):
Phase.__init__(self, parser, tree)

self.startTagHandler = utils.MethodDispatcher([
("html", self.startTagHtml),
("head", self.startTagHead)
(("html",), self.startTagHtml),
(("head",), self.startTagHead)
])
self.startTagHandler.default = self.startTagOther

Expand DownExpand Up@@ -695,19 +695,19 @@ def __init__(self, parser, tree):
Phase.__init__(self, parser, tree)

self.startTagHandler = utils.MethodDispatcher([
("html", self.startTagHtml),
("title", self.startTagTitle),
(("html",), self.startTagHtml),
(("title",), self.startTagTitle),
(("noscript", "noframes", "style"), self.startTagNoScriptNoFramesStyle),
("script", self.startTagScript),
(("script",), self.startTagScript),
(("base", "basefont", "bgsound", "command", "link"),
self.startTagBaseLinkCommand),
("meta", self.startTagMeta),
("head", self.startTagHead)
(("meta",), self.startTagMeta),
(("head",), self.startTagHead)
])
self.startTagHandler.default = self.startTagOther

self. endTagHandler = utils.MethodDispatcher([
("head", self.endTagHead),
(("head",), self.endTagHead),
(("br", "html", "body"), self.endTagHtmlBodyBr)
])
self.endTagHandler.default = self.endTagOther
Expand DownExpand Up@@ -794,13 +794,13 @@ def __init__(self, parser, tree):
Phase.__init__(self, parser, tree)

self.startTagHandler = utils.MethodDispatcher([
("html", self.startTagHtml),
("body", self.startTagBody),
("frameset", self.startTagFrameset),
(("html",), self.startTagHtml),
(("body",), self.startTagBody),
(("frameset",), self.startTagFrameset),
(("base", "basefont", "bgsound", "link", "meta", "noframes", "script",
"style", "title"),
self.startTagFromHead),
("head", self.startTagHead)
(("head",), self.startTagHead)
])
self.startTagHandler.default = self.startTagOther
self.endTagHandler = utils.MethodDispatcher([(("body", "html", "br"),
Expand DownExpand Up@@ -866,66 +866,66 @@ def __init__(self, parser, tree):
self.processSpaceCharactersNonPre = self.processSpaceCharacters

self.startTagHandler = utils.MethodDispatcher([
("html", self.startTagHtml),
(("html",), self.startTagHtml),
(("base", "basefont", "bgsound", "command", "link", "meta",
"noframes", "script", "style", "title"),
self.startTagProcessInHead),
("body", self.startTagBody),
("frameset", self.startTagFrameset),
(("body",), self.startTagBody),
(("frameset",), self.startTagFrameset),
(("address", "article", "aside", "blockquote", "center", "details",
"details", "dir", "div", "dl", "fieldset", "figcaption", "figure",
"footer", "header", "hgroup", "main", "menu", "nav", "ol", "p",
"section", "summary", "ul"),
"dir", "div", "dl", "fieldset", "figcaption", "figure", "footer",
"header", "hgroup", "main", "menu", "nav", "ol", "p", "section",
"summary", "ul"),
self.startTagCloseP),
(headingElements, self.startTagHeading),
(("pre", "listing"), self.startTagPreListing),
("form", self.startTagForm),
(("form",), self.startTagForm),
(("li", "dd", "dt"), self.startTagListItem),
("plaintext", self.startTagPlaintext),
("a", self.startTagA),
(("plaintext",), self.startTagPlaintext),
(("a",), self.startTagA),
(("b", "big", "code", "em", "font", "i", "s", "small", "strike",
"strong", "tt", "u"), self.startTagFormatting),
("nobr", self.startTagNobr),
("button", self.startTagButton),
(("nobr",), self.startTagNobr),
(("button",), self.startTagButton),
(("applet", "marquee", "object"), self.startTagAppletMarqueeObject),
("xmp", self.startTagXmp),
("table", self.startTagTable),
(("xmp",), self.startTagXmp),
(("table",), self.startTagTable),
(("area", "br", "embed", "img", "keygen", "wbr"),
self.startTagVoidFormatting),
(("param", "source", "track"), self.startTagParamSource),
("input", self.startTagInput),
("hr", self.startTagHr),
("image", self.startTagImage),
("isindex", self.startTagIsIndex),
("textarea", self.startTagTextarea),
("iframe", self.startTagIFrame),
(("noembed", "noframes", "noscript"), self.startTagRawtext),
("select", self.startTagSelect),
(("input",), self.startTagInput),
(("hr",), self.startTagHr),
(("image",), self.startTagImage),
(("isindex",), self.startTagIsIndex),
(("textarea",), self.startTagTextarea),
(("iframe",), self.startTagIFrame),
(("noembed", "noscript"), self.startTagRawtext),
(("select",), self.startTagSelect),
(("rp", "rt"), self.startTagRpRt),
(("option", "optgroup"), self.startTagOpt),
(("math"), self.startTagMath),
(("svg"), self.startTagSvg),
(("math",), self.startTagMath),
(("svg",), self.startTagSvg),
(("caption", "col", "colgroup", "frame", "head",
"tbody", "td", "tfoot", "th", "thead",
"tr"), self.startTagMisplaced)
])
self.startTagHandler.default = self.startTagOther

self.endTagHandler = utils.MethodDispatcher([
("body", self.endTagBody),
("html", self.endTagHtml),
(("body",), self.endTagBody),
(("html",), self.endTagHtml),
(("address", "article", "aside", "blockquote", "button", "center",
"details", "dialog", "dir", "div", "dl", "fieldset", "figcaption", "figure",
"footer", "header", "hgroup", "listing", "main", "menu", "nav", "ol", "pre",
"section", "summary", "ul"), self.endTagBlock),
("form", self.endTagForm),
("p", self.endTagP),
(("form",), self.endTagForm),
(("p",), self.endTagP),
(("dd", "dt", "li"), self.endTagListItem),
(headingElements, self.endTagHeading),
(("a", "b", "big", "code", "em", "font", "i", "nobr", "s", "small",
"strike", "strong", "tt", "u"), self.endTagFormatting),
(("applet", "marquee", "object"), self.endTagAppletMarqueeObject),
("br", self.endTagBr),
(("br",), self.endTagBr),
])
self.endTagHandler.default = self.endTagOther

Expand DownExpand Up@@ -1587,7 +1587,7 @@ def __init__(self, parser, tree):
self.startTagHandler = utils.MethodDispatcher([])
self.startTagHandler.default = self.startTagOther
self.endTagHandler = utils.MethodDispatcher([
("script", self.endTagScript)])
(("script",), self.endTagScript)])
self.endTagHandler.default = self.endTagOther

def processCharacters(self, token):
Expand DownExpand Up@@ -1619,21 +1619,21 @@ class InTablePhase(Phase):
def __init__(self, parser, tree):
Phase.__init__(self, parser, tree)
self.startTagHandler = utils.MethodDispatcher([
("html", self.startTagHtml),
("caption", self.startTagCaption),
("colgroup", self.startTagColgroup),
("col", self.startTagCol),
(("html",), self.startTagHtml),
(("caption",), self.startTagCaption),
(("colgroup",), self.startTagColgroup),
(("col",), self.startTagCol),
(("tbody", "tfoot", "thead"), self.startTagRowGroup),
(("td", "th", "tr"), self.startTagImplyTbody),
("table", self.startTagTable),
(("table",), self.startTagTable),
(("style", "script"), self.startTagStyleScript),
("input", self.startTagInput),
("form", self.startTagForm)
(("input",), self.startTagInput),
(("form",), self.startTagForm)
])
self.startTagHandler.default = self.startTagOther

self.endTagHandler = utils.MethodDispatcher([
("table", self.endTagTable),
(("table",), self.endTagTable),
(("body", "caption", "col", "colgroup", "html", "tbody", "td",
"tfoot", "th", "thead", "tr"), self.endTagIgnore)
])
Expand DownExpand Up@@ -1810,15 +1810,15 @@ def __init__(self, parser, tree):
Phase.__init__(self, parser, tree)

self.startTagHandler = utils.MethodDispatcher([
("html", self.startTagHtml),
(("html",), self.startTagHtml),
(("caption", "col", "colgroup", "tbody", "td", "tfoot", "th",
"thead", "tr"), self.startTagTableElement)
])
self.startTagHandler.default = self.startTagOther

self.endTagHandler = utils.MethodDispatcher([
("caption", self.endTagCaption),
("table", self.endTagTable),
(("caption",), self.endTagCaption),
(("table",), self.endTagTable),
(("body", "col", "colgroup", "html", "tbody", "td", "tfoot", "th",
"thead", "tr"), self.endTagIgnore)
])
Expand DownExpand Up@@ -1882,14 +1882,14 @@ def __init__(self, parser, tree):
Phase.__init__(self, parser, tree)

self.startTagHandler = utils.MethodDispatcher([
("html", self.startTagHtml),
("col", self.startTagCol)
(("html",), self.startTagHtml),
(("col",), self.startTagCol)
])
self.startTagHandler.default = self.startTagOther

self.endTagHandler = utils.MethodDispatcher([
("colgroup", self.endTagColgroup),
("col", self.endTagCol)
(("colgroup",), self.endTagColgroup),
(("col",), self.endTagCol)
])
self.endTagHandler.default = self.endTagOther

Expand DownExpand Up@@ -1945,8 +1945,8 @@ class InTableBodyPhase(Phase):
def __init__(self, parser, tree):
Phase.__init__(self, parser, tree)
self.startTagHandler = utils.MethodDispatcher([
("html", self.startTagHtml),
("tr", self.startTagTr),
(("html",), self.startTagHtml),
(("tr",), self.startTagTr),
(("td", "th"), self.startTagTableCell),
(("caption", "col", "colgroup", "tbody", "tfoot", "thead"),
self.startTagTableOther)
Expand All@@ -1955,7 +1955,7 @@ def __init__(self, parser, tree):

self.endTagHandler = utils.MethodDispatcher([
(("tbody", "tfoot", "thead"), self.endTagTableRowGroup),
("table", self.endTagTable),
(("table",), self.endTagTable),
(("body", "caption", "col", "colgroup", "html", "td", "th",
"tr"), self.endTagIgnore)
])
Expand DownExpand Up@@ -2043,16 +2043,16 @@ class InRowPhase(Phase):
def __init__(self, parser, tree):
Phase.__init__(self, parser, tree)
self.startTagHandler = utils.MethodDispatcher([
("html", self.startTagHtml),
(("html",), self.startTagHtml),
(("td", "th"), self.startTagTableCell),
(("caption", "col", "colgroup", "tbody", "tfoot", "thead",
"tr"), self.startTagTableOther)
])
self.startTagHandler.default = self.startTagOther

self.endTagHandler = utils.MethodDispatcher([
("tr", self.endTagTr),
("table", self.endTagTable),
(("tr",), self.endTagTr),
(("table",), self.endTagTable),
(("tbody", "tfoot", "thead"), self.endTagTableRowGroup),
(("body", "caption", "col", "colgroup", "html", "td", "th"),
self.endTagIgnore)
Expand DownExpand Up@@ -2132,7 +2132,7 @@ class InCellPhase(Phase):
def __init__(self, parser, tree):
Phase.__init__(self, parser, tree)
self.startTagHandler = utils.MethodDispatcher([
("html", self.startTagHtml),
(("html",), self.startTagHtml),
(("caption", "col", "colgroup", "tbody", "td", "tfoot", "th",
"thead", "tr"), self.startTagTableOther)
])
Expand DownExpand Up@@ -2208,19 +2208,19 @@ def __init__(self, parser, tree):
Phase.__init__(self, parser, tree)

self.startTagHandler = utils.MethodDispatcher([
("html", self.startTagHtml),
("option", self.startTagOption),
("optgroup", self.startTagOptgroup),
("select", self.startTagSelect),
(("html",), self.startTagHtml),
(("option",), self.startTagOption),
(("optgroup",), self.startTagOptgroup),
(("select",), self.startTagSelect),
(("input", "keygen", "textarea"), self.startTagInput),
("script", self.startTagScript)
(("script",), self.startTagScript)
])
self.startTagHandler.default = self.startTagOther

self.endTagHandler = utils.MethodDispatcher([
("option", self.endTagOption),
("optgroup", self.endTagOptgroup),
("select", self.endTagSelect)
(("option",), self.endTagOption),
(("optgroup",), self.endTagOptgroup),
(("select",), self.endTagSelect)
])
self.endTagHandler.default = self.endTagOther

Expand DownExpand Up@@ -2462,11 +2462,13 @@ def __init__(self, parser, tree):
Phase.__init__(self, parser, tree)

self.startTagHandler = utils.MethodDispatcher([
("html", self.startTagHtml)
(("html",), self.startTagHtml)
])
self.startTagHandler.default = self.startTagOther

self.endTagHandler = utils.MethodDispatcher([("html", self.endTagHtml)])
self.endTagHandler = utils.MethodDispatcher([
(("html",), self.endTagHtml)
])
self.endTagHandler.default = self.endTagOther

def processEOF(self):
Expand DownExpand Up@@ -2510,15 +2512,15 @@ def __init__(self, parser, tree):
Phase.__init__(self, parser, tree)

self.startTagHandler = utils.MethodDispatcher([
("html", self.startTagHtml),
("frameset", self.startTagFrameset),
("frame", self.startTagFrame),
("noframes", self.startTagNoframes)
(("html",), self.startTagHtml),
(("frameset",), self.startTagFrameset),
(("frame",), self.startTagFrame),
(("noframes",), self.startTagNoframes)
])
self.startTagHandler.default = self.startTagOther

self.endTagHandler = utils.MethodDispatcher([
("frameset", self.endTagFrameset)
(("frameset",), self.endTagFrameset)
])
self.endTagHandler.default = self.endTagOther

Expand DownExpand Up@@ -2567,13 +2569,13 @@ def __init__(self, parser, tree):
Phase.__init__(self, parser, tree)

self.startTagHandler = utils.MethodDispatcher([
("html", self.startTagHtml),
("noframes", self.startTagNoframes)
(("html",), self.startTagHtml),
(("noframes",), self.startTagNoframes)
])
self.startTagHandler.default = self.startTagOther

self.endTagHandler = utils.MethodDispatcher([
("html", self.endTagHtml)
(("html",), self.endTagHtml)
])
self.endTagHandler.default = self.endTagOther

Expand DownExpand Up@@ -2603,7 +2605,7 @@ def __init__(self, parser, tree):
Phase.__init__(self, parser, tree)

self.startTagHandler = utils.MethodDispatcher([
("html", self.startTagHtml)
(("html",), self.startTagHtml)
])
self.startTagHandler.default = self.startTagOther

Expand DownExpand Up@@ -2641,8 +2643,8 @@ def __init__(self, parser, tree):
Phase.__init__(self, parser, tree)

self.startTagHandler = utils.MethodDispatcher([
("html", self.startTagHtml),
("noframes", self.startTagNoFrames)
(("html",), self.startTagHtml),
(("noframes",), self.startTagNoFrames)
])
self.startTagHandler.default = self.startTagOther

Expand Down
12 changes: 5 additions & 7 deletionshtml5lib/utils.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,14 +29,12 @@ def __init__(self, items=()):
# Using _dictEntries instead of directly assigning to self is about
# twice as fast. Please do careful performance testing before changing
# anything here.
_dictEntries = []
dict.__init__(self)
for name, value in items:
if type(name) in (list, tuple, frozenset, set):
for item in name:
_dictEntries.append((item, value))
else:
_dictEntries.append((name, value))
dict.__init__(self, _dictEntries)
assert isinstance(name, (list, tuple, frozenset, set)), repr(name)
for item in name:
assert item not in self, "%s duplicated" % item
self[item] = value
self.default = None

def __getitem__(self, key):
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp