Skip to content

Document - Correct when instantiated with bytes content instead of bytes #195

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Document - Correct when instantiated with bytes content instead of bytes #195

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
10 changes: 5 additions & 5 deletions readability/encoding.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import chardet


RE_CHARSET = re.compile(r'<meta.*?charset=["\']*(.+?)["\'>]', flags=re.I)
RE_PRAGMA = re.compile(r'<meta.*?content=["\']*;?charset=(.+?)["\'>]', flags=re.I)
RE_XML = re.compile(r'^<\?xml.*?encoding=["\']*(.+?)["\'>]')
RE_CHARSET = re.compile(br'<meta.*?charset=["\']*(.+?)["\'>]', flags=re.I)
RE_PRAGMA = re.compile(br'<meta.*?content=["\']*;?charset=(.+?)["\'>]', flags=re.I)
RE_XML = re.compile(br'^<\?xml.*?encoding=["\']*(.+?)["\'>]')

CHARSETS = {
"big5": "big5hkscs",
Expand Down Expand Up @@ -53,11 +53,11 @@ def get_encoding(page):

# Fallback to chardet if declared encodings fail
# Remove all HTML tags, and leave only text for chardet
text = re.sub(r'(\s*</?[^>]*>)+\s*', ' ', page).strip()
enc = 'utf-8'
text = re.sub(r'(\s*</?[^>]*>)+\s*', ' ', page.decode(enc, "replace")).strip()
if len(text) < 10:
return enc # can't guess
res = chardet.detect(text)
res = chardet.detect(page)
enc = res["encoding"] or "utf-8"
# print '->', enc, "%.2f" % res['confidence']
enc = fix_charset(enc)
Expand Down
11 changes: 11 additions & 0 deletions tests/test_article_only.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,17 @@ def test_best_elem_is_root_and_passing(self):
doc = Document(sample)
doc.summary()

def test_html_input_in_bytes(self):
sample = (
b'<html class="article" id="body">'
b" <body>"
b" <p>1234567890123456789012345</p>"
b" </body>"
b"</html>"
)
doc = Document(sample)
doc.summary()

def test_correct_cleanup(self):
sample = """
<html>
Expand Down