-
Notifications
You must be signed in to change notification settings - Fork 24
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix unwanted joins for inline tags #2
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
6135ba6
Add whitespace even for inline tags
lopuhin 43f1bd4
Cache regexp
lopuhin f020f4b
guess_punct_space: remove whitespace before punct
lopuhin 73bf2ac
Slightly faster and cleaner default path
lopuhin e9cf9b8
Cache method lookup, more readable loop conditions
lopuhin 1fb2ec4
Make guess_punct_space=True by default, document
lopuhin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,49 @@ | ||
# -*- coding: utf-8 -*- | ||
import pytest | ||
|
||
from html_text import extract_text, parse_html | ||
|
||
|
||
def test_extract_text(): | ||
@pytest.fixture(params=[{'guess_punct_space': True}, | ||
{'guess_punct_space': False}]) | ||
def all_options(request): | ||
return request.param | ||
|
||
|
||
def test_extract_text(all_options): | ||
html = u'<html><style>.div {}</style><body><p>Hello, world!</body></html>' | ||
assert extract_text(html) == u'Hello, world!' | ||
assert extract_text(html, **all_options) == u'Hello, world!' | ||
|
||
|
||
def test_declared_encoding(): | ||
def test_declared_encoding(all_options): | ||
html = (u'<?xml version="1.0" encoding="utf-8" ?>' | ||
u'<html><style>.div {}</style>' | ||
u'<body>Hello, world!</p></body></html>') | ||
assert extract_text(html) == u'Hello, world!' | ||
assert extract_text(html, **all_options) == u'Hello, world!' | ||
|
||
|
||
def test_empty(): | ||
assert extract_text(u'') == '' | ||
def test_empty(all_options): | ||
assert extract_text(u'', **all_options) == '' | ||
|
||
|
||
def test_extract_text_from_tree(): | ||
def test_extract_text_from_tree(all_options): | ||
html = u'<html><style>.div {}</style><body><p>Hello, world!</body></html>' | ||
tree = parse_html(html) | ||
assert extract_text(tree) == u'Hello, world!' | ||
assert extract_text(tree, **all_options) == u'Hello, world!' | ||
|
||
|
||
def test_inline_tags_whitespace(all_options): | ||
html = u'<span>field</span><span>value of</span><span></span>' | ||
assert extract_text(html, **all_options) == u'field value of' | ||
|
||
|
||
def test_punct_whitespace(): | ||
html = u'<div><span>field</span>, and more</div>' | ||
assert extract_text(html, guess_punct_space=False) == u'field , and more' | ||
|
||
|
||
def test_punct_whitespace_preserved(): | ||
html = (u'<div><span>по</span><span>ле</span>, and , ' | ||
u'<span>more </span>!<span>now</div>a (<b>boo</b>)') | ||
assert (extract_text(html, guess_punct_space=True) == | ||
u'по ле, and , more ! now a (boo)') |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd recommend using
'.//text()'
so that it can be used for any selector, and not only those coming fromextract_text(html)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's a great idea, thanks @redapple - I'd like to also make it possible to pass selectors via the public interface.