Skip to content

tests: drop dependency on external mock module for newer python #574

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 3 commits into from
Jan 10, 2024
Merged

tests: drop dependency on external mock module for newer python #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ec6e5e
tests: drop dependency on external mock module for newer python
eli-schwartz Oct 17, 2023
2a6b51f
Merge branch 'master' into tests-mock-dep
ambv Jan 10, 2024
462e6b3
Use `ImportError` instead of bare `except:`
ambv Jan 10, 2024
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
5 changes: 4 additions & 1 deletion html5lib/tests/test_meta.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
from __future__ import absolute_import, division, unicode_literals

import six
from mock import Mock
try:
from unittest.mock import Mock
except ImportError:
from mock import Mock

from . import support

Expand Down
3 changes: 1 addition & 2 deletions requirements-test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ pytest>=4.6.10,<5 ; python_version < '3'
pytest>=5.4.2,<8 ; python_version >= '3'
coverage>=5.1,<6
pytest-expect>=1.1.0,<2
mock>=3.0.5,<4 ; python_version < '3.6'
mock>=4.0.2,<5 ; python_version >= '3.6'
mock>=3.0.5,<4 ; python_version < '3.3'
setuptools; python_version >= '3.12'