Skip to content

Add a usedEncoding method to HTML5Parser, fix #121 #129

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Add a usedEncoding method to HTML5Parser, fix #121 #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9aab922
Add a usedEncoding method to HTML5Parser, fix #121
SimonSapin Nov 30, 2013
722bfd3
Rename the usedEncoding method to documentEncoding, and make it a pro…
SimonSapin Dec 2, 2013
381fd0c
Clarify the expected TypeError test.
SimonSapin Dec 31, 2013
3acebfe
Remove test_unicode_input_encoding which was redundant with runParser…
SimonSapin Dec 31, 2013
8309f4a
Use documentEncoding == 'utf-8' rather than None for Unicode input.
SimonSapin Dec 31, 2013
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
11 changes: 11 additions & 0 deletions html5lib/html5parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,17 @@ def reset(self):

self.framesetOK = True

@property
def documentEncoding(self):
"""The name of the character encoding
that was used to decode the input stream,
or :obj:`None` if that is not determined yet.

"""
if not hasattr(self, 'tokenizer'):
return None
return self.tokenizer.stream.charEncoding[0]

def isHTMLIntegrationPoint(self, element):
if (element.name == "annotation-xml" and
element.namespace == namespaces["mathml"]):
Expand Down
3 changes: 2 additions & 1 deletion html5lib/tests/test_encoding.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@ def test_codec_name_d(self):

def runParserEncodingTest(data, encoding):
p = HTMLParser()
assert p.documentEncoding is None
p.parse(data, useChardet=False)
encoding = encoding.lower().decode("ascii")

assert encoding == p.tokenizer.stream.charEncoding[0], errorMessage(data, encoding, p.tokenizer.stream.charEncoding[0])
assert encoding == p.documentEncoding, errorMessage(data, encoding, p.documentEncoding)


def runPreScanEncodingTest(data, encoding):
Expand Down