chore: update codebase for modern python

We're on Python 3.7 and higher, so we can clean up any artifacts left
from previously-supported Python eras.

Most of the heavy lifting was done with `pyupgrade` followed by unused
improts removal (thanks to `flake8` check)

Refs: https://pypi.org/project/pyupgrade/

Closes pypa#203

Signed-off-by: Mike Fiedler <miketheman@gmail.com>

readme_renderer/__about__.py

@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import absolute_import, division, print_function
 
 __all__ = [
     "__title__",

readme_renderer/__init__.py

@@ -11,4 +11,3 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import absolute_import, division, print_function

readme_renderer/__main__.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import, print_function
 import argparse
 from readme_renderer.rst import render
 import sys

readme_renderer/clean.py

@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import absolute_import, division, print_function
 
 import functools
 from typing import Any, Dict, Iterator, List, Optional

readme_renderer/markdown.py

@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import absolute_import, division, print_function
 
 import re
 import warnings
@@ -117,7 +116,7 @@ def replacer(match: Match[Any]) -> str:
 
         highlighted = pygments.highlight(code, lexer, formatter)
 
-        return '<pre>{}</pre>'.format(highlighted)
+        return f'<pre>{highlighted}</pre>'
 
     result = code_expr.sub(replacer, html)
 

readme_renderer/rst.py

@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import absolute_import, division, print_function
 
 import io
 from typing import Any, Dict, IO, Optional, Union
@@ -43,7 +42,7 @@ def emptytag(
             if "height" in node:
                 attributes["height"] = node["height"]
 
-        return super(ReadMeHTMLTranslator, self).emptytag(
+        return super().emptytag(
             node, tagname, suffix, **attributes
         )
 

readme_renderer/txt.py

@@ -11,20 +11,12 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import absolute_import, division, print_function
 
-import sys
 from typing import Any, Optional
 
 from .clean import clean
 
-if sys.version_info >= (3,):
-    from html import escape as html_escape
-else:
-    from cgi import escape
-
-    def html_escape(s):
-        return escape(s, quote=True).replace("'", ''')
+from html import escape as html_escape
 
 
 def render(raw: str, **kwargs: Any) -> Optional[str]:

setup.py

@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import absolute_import, division, print_function
 
 import os
 

tests/test_markdown.py

@@ -1,4 +1,3 @@
-import io
 import glob
 import os
 
@@ -26,11 +25,11 @@
 )
 def test_md_fixtures(md_filename, html_filename, variant):
     # Get our Markup
-    with io.open(md_filename, encoding='utf-8') as f:
+    with open(md_filename, encoding='utf-8') as f:
         md_markup = f.read()
 
     # Get our expected
-    with io.open(html_filename, encoding="utf-8") as f:
+    with open(html_filename, encoding="utf-8") as f:
         expected = f.read()
 
     assert render(md_markup, variant=variant) == expected

tests/test_rst.py

@@ -18,11 +18,11 @@
 )
 def test_rst_fixtures(rst_filename, html_filename):
     # Get our Markup
-    with io.open(rst_filename, encoding='utf-8') as f:
+    with open(rst_filename, encoding='utf-8') as f:
         rst_markup = f.read()
 
     # Get our expected
-    with io.open(html_filename, encoding="utf-8") as f:
+    with open(html_filename, encoding="utf-8") as f:
         expected = f.read()
 
     out = render(rst_markup)

tests/test_txt.py

@@ -1,4 +1,3 @@
-import io
 import glob
 import os.path
 
@@ -18,11 +17,11 @@
 )
 def test_txt_fixtures(txt_filename, html_filename):
     # Get our Markup
-    with io.open(txt_filename, encoding='utf-8') as f:
+    with open(txt_filename, encoding='utf-8') as f:
         txt_markup = f.read()
 
     # Get our expected
-    with io.open(html_filename, encoding="utf-8") as f:
+    with open(html_filename, encoding="utf-8") as f:
         expected = f.read()
 
     out = render(txt_markup)