Skip to content
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

Use new sybil 3 name for codeblock parser if available #167

Merged
merged 4 commits into from
Feb 25, 2022
Merged

Use new sybil 3 name for codeblock parser if available #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5cc3a8
Use new sybil 3 name for codeblock parser if available
bnavigator Dec 21, 2021
5feb711
unpin sybil
bnavigator Dec 21, 2021
bcff798
cater for sybil 3 API change
bnavigator Dec 21, 2021
daa5c39
change byte unicode return
bnavigator Dec 21, 2021
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
14 changes: 11 additions & 3 deletions docs/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
from doctest import REPORT_NDIFF, ELLIPSIS

from sybil import Sybil
from sybil.parsers.doctest import DocTestParser, FIX_BYTE_UNICODE_REPR
from sybil.parsers.codeblock import CodeBlockParser
from sybil.parsers.doctest import DocTestParser
try:
from sybil.parsers.doctest import FIX_BYTE_UNICODE_REPR
except ImportError:
# sybil 3 removed the optionflag
FIX_BYTE_UNICODE_REPR = 0
try:
from sybil.parsers.codeblock import PythonCodeBlockParser
except ImportError:
from sybil.parsers.codeblock import CodeBlockParser as PythonCodeBlockParser
from sybil.parsers.capture import parse_captures

from testfixtures.compat import PY3
Expand All @@ -13,7 +21,7 @@
pytest_collect_file = Sybil(
parsers=[
DocTestParser(optionflags=REPORT_NDIFF|ELLIPSIS|FIX_BYTE_UNICODE_REPR),
CodeBlockParser(['print_function']),
PythonCodeBlockParser(['print_function']),
parse_captures,
FileParser('tempdir'),
],
Expand Down
6 changes: 3 additions & 3 deletions docs/django.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Traceback (most recent call last):
AssertionError: SampleModel not as expected:
<BLANKLINE>
same:
[u'id']
['id']
<BLANKLINE>
values differ:
'value': 1 != 2
Expand All @@ -38,7 +38,7 @@ Traceback (most recent call last):
AssertionError: SampleModel not as expected:
<BLANKLINE>
same:
[u'id']
['id']
<BLANKLINE>
values differ:
'value': 1 != 2
Expand Down Expand Up @@ -70,7 +70,7 @@ Traceback (most recent call last):
AssertionError: SampleModel not as expected:
<BLANKLINE>
same:
['created', u'id', 'value']
['created', 'id', 'value']
<BLANKLINE>
values differ:
'not_editable': 1 != 2
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
'zope.component',
'django<2;python_version<"3"',
'django;python_version>="3"',
'sybil<3',
'sybil',
'twisted'
]

Expand Down
8 changes: 6 additions & 2 deletions testfixtures/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
from sybil import Sybil
from sybil.parsers.doctest import DocTestParser
from sybil.parsers.codeblock import CodeBlockParser
try:
from sybil.parsers.codeblock import PythonCodeBlockParser
except ImportError:
# sybil < 3 has it under the old name
from sybil.parsers.codeblock import CodeBlockParser as PythonCodeBlockParser
from sybil.parsers.capture import parse_captures

from testfixtures import TempDirectory
Expand All @@ -18,7 +22,7 @@ def sybil_teardown(namespace):
pytest_collect_file = Sybil(
parsers=[
DocTestParser(),
CodeBlockParser(),
PythonCodeBlockParser(),
parse_captures,
FileParser('tempdir'),
],
Expand Down