Skip to content

Get rid of obsolete replacement of unpaired surrogates with U+FFFD. #175

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

Merged
merged 1 commit into from
Jan 12, 2016
Merged

Get rid of obsolete replacement of unpaired surrogates with U+FFFD. #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file modified .pytest.expect
View file
Open in desktop
Binary file not shown.
9 changes: 1 addition & 8 deletions html5lib/inputstream.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,14 +185,10 @@ def __init__(self, source):
# Such platforms will have already checked for such
# surrogate errors, so no need to do this checking.
self.reportCharacterErrors = None
self.replaceCharactersRegexp = None
elif len("\U0010FFFF") == 1:
self.reportCharacterErrors = self.characterErrorsUCS4
self.replaceCharactersRegexp = re.compile(eval('"[\\uD800-\\uDFFF]"'))
else:
self.reportCharacterErrors = self.characterErrorsUCS2
self.replaceCharactersRegexp = re.compile(
eval('"([\\uD800-\\uDBFF](?![\\uDC00-\\uDFFF])|(?<![\\uD800-\\uDBFF])[\\uDC00-\\uDFFF])"'))

# List of where new lines occur
self.newLines = [0]
Expand Down Expand Up @@ -290,10 +286,7 @@ def readChunk(self, chunkSize=None):
if self.reportCharacterErrors:
self.reportCharacterErrors(data)

# Replace invalid characters
# Note U+0000 is dealt with in the tokenizer
data = self.replaceCharactersRegexp.sub("\ufffd", data)

# Replace invalid characters
data = data.replace("\r\n", "\n")
data = data.replace("\r", "\n")

Expand Down