Merge pull request #192 from mgorny/py3-mock

Remove py2-specific dependencies and fix tests

Author: di

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Install Python
         uses: actions/setup-python@v2
         with:
-          python-version: ${{ matrix.python_version }}
+          python-version: ${{ matrix.python-version }}
       - name: Install dependencies
         run: python -m pip install tox
       - name: Run tests

readme_renderer/integration/distutils.py

@@ -20,7 +20,6 @@
 import distutils.log
 from distutils.command.check import check as _check
 from distutils.core import Command
-import six
 
 from ..rst import render
 
@@ -35,7 +34,6 @@
     r'(?P<message>.*)', re.DOTALL | re.MULTILINE)
 
 
-@six.python_2_unicode_compatible
 class _WarningStream(object):
     def __init__(self):
         self.output = io.StringIO()

readme_renderer/markdown.py

@@ -16,17 +16,12 @@
 import re
 import warnings
 
+from html.parser import unescape
+
 import pygments
 import pygments.lexers
 import pygments.formatters
 
-try:
-    from six.moves.html_parser import unescape
-except ImportError:  # Python 2
-    from six.moves import html_parser
-
-    unescape = html_parser.HTMLParser().unescape
-
 from .clean import clean
 
 _EXTRA_WARNING = (

setup.py

@@ -55,7 +55,7 @@
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
     ],
-    install_requires=["bleach>=2.1.0", "docutils>=0.13.1", "Pygments>=2.5.1", "six"],
+    install_requires=["bleach>=2.1.0", "docutils>=0.13.1", "Pygments>=2.5.1"],
     entry_points={
         "distutils.commands": ["check = readme_renderer.integration.distutils:Check"],
     },

tests/test_integration_distutils.py

@@ -1,6 +1,6 @@
 import distutils.dist
+import unittest.mock
 
-import mock
 import pytest
 import setuptools.dist
 
@@ -11,7 +11,7 @@ def test_valid_rst():
     dist = distutils.dist.Distribution(attrs=dict(
         long_description="Hello, I am some text."))
     checker = readme_renderer.integration.distutils.Check(dist)
-    checker.warn = mock.Mock()
+    checker.warn = unittest.mock.Mock()
 
     checker.check_restructuredtext()
 
@@ -22,14 +22,14 @@ def test_invalid_rst():
     dist = distutils.dist.Distribution(attrs=dict(
         long_description="Hello, I am some `totally borked< text."))
     checker = readme_renderer.integration.distutils.Check(dist)
-    checker.warn = mock.Mock()
-    checker.announce = mock.Mock()
+    checker.warn = unittest.mock.Mock()
+    checker.announce = unittest.mock.Mock()
 
     checker.check_restructuredtext()
 
     # Should warn once for the syntax error, and finally to warn that the
     # overall syntax is invalid
-    checker.warn.assert_called_once_with(mock.ANY)
+    checker.warn.assert_called_once_with(unittest.mock.ANY)
     message = checker.warn.call_args[0][0]
     assert 'invalid markup' in message
     assert 'line 1: Warning:' in message
@@ -47,14 +47,14 @@ def test_malicious_rst():
     dist = distutils.dist.Distribution(attrs=dict(
         long_description=description))
     checker = readme_renderer.integration.distutils.Check(dist)
-    checker.warn = mock.Mock()
-    checker.announce = mock.Mock()
+    checker.warn = unittest.mock.Mock()
+    checker.announce = unittest.mock.Mock()
 
     checker.check_restructuredtext()
 
     # Should warn once for the syntax error, and finally to warn that the
     # overall syntax is invalid
-    checker.warn.assert_called_once_with(mock.ANY)
+    checker.warn.assert_called_once_with(unittest.mock.ANY)
     message = checker.warn.call_args[0][0]
     assert 'directive disabled' in message
 
@@ -68,7 +68,7 @@ def test_markdown():
         long_description="Hello, I am some text.",
         long_description_content_type="text/markdown"))
     checker = readme_renderer.integration.distutils.Check(dist)
-    checker.warn = mock.Mock()
+    checker.warn = unittest.mock.Mock()
 
     checker.check_restructuredtext()
 
@@ -79,21 +79,21 @@ def test_markdown():
 def test_invalid_missing():
     dist = distutils.dist.Distribution(attrs=dict())
     checker = readme_renderer.integration.distutils.Check(dist)
-    checker.warn = mock.Mock()
+    checker.warn = unittest.mock.Mock()
 
     checker.check_restructuredtext()
 
-    checker.warn.assert_called_once_with(mock.ANY)
+    checker.warn.assert_called_once_with(unittest.mock.ANY)
     assert 'missing' in checker.warn.call_args[0][0]
 
 
 def test_invalid_empty():
     dist = distutils.dist.Distribution(attrs=dict(
         long_description=""))
     checker = readme_renderer.integration.distutils.Check(dist)
-    checker.warn = mock.Mock()
+    checker.warn = unittest.mock.Mock()
 
     checker.check_restructuredtext()
 
-    checker.warn.assert_called_once_with(mock.ANY)
+    checker.warn.assert_called_once_with(unittest.mock.ANY)
     assert 'missing' in checker.warn.call_args[0][0]

tests/test_rst.py

@@ -3,7 +3,6 @@
 import os.path
 
 import pytest
-import six
 
 from readme_renderer.rst import render
 
@@ -46,7 +45,7 @@ def test_rst_002():
 
 
 def test_rst_raw():
-    warnings = six.StringIO()
+    warnings = io.StringIO()
     assert render("""
 .. raw:: html
     <script>I am evil</script>

tox.ini

@@ -4,9 +4,8 @@ envlist = py36,py37,py38,py39,pep8,packaging,noextra
 [testenv]
 deps =
     pytest
-    mock
 commands =
-    py.test --strict {posargs}
+    pytest --strict {posargs}
 extras = md
 
 [testenv:pep8]