working on v.12 mypy (#37)

jvanasco · Jun 8, 2023 · db6d6a4 · db6d6a4
1 parent 4e9225a
commit db6d6a4
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 34 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -6,7 +6,6 @@
     * drop python 2.7
     * initial typing support
 
-
 0.11.0 | UNRELEASED
 
   * BREAKING CHANGES

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.black]
 line-length = 88
-target-version = ['py38']
+target-version = ['py36']
 exclude = '''
 (
     /(

diff --git a/src/metadata_parser/py.typed b/src/metadata_parser/py.typed
diff --git a/tests/_compat.py b/tests/_compat.py
diff --git a/tests/test_document_parsing.py b/tests/test_document_parsing.py
@@ -300,17 +300,17 @@ class TestEncoders(unittest.TestCase):
 
     _data = {
         "unicode_whitespace": {
-            "raw": u"""Example line with\xa0unicode whitespace.""",
+            "raw": """Example line with\xa0unicode whitespace.""",
             "ascii": """Example line with unicode whitespace.""",
         },
         "unicode_chars": {
-            "raw": u"""Example line with\xc2\xa0unicode chars.""",
+            "raw": """Example line with\xc2\xa0unicode chars.""",
             "ascii": """Example line withA unicode chars.""",
         },
         "decode_html_encoder": {
-            "html": u"""<html><head><meta name="description" content="Foo&amp;nbsp;Bar, &amp;quot;Biz Bang Bash.&amp;quot;"/></head></html>""",
-            "parsed": u"Foo&nbsp;Bar, &quot;Biz Bang Bash.&quot;",
-            "decoded": u'Foo Bar, "Biz Bang Bash."',
+            "html": """<html><head><meta name="description" content="Foo&amp;nbsp;Bar, &amp;quot;Biz Bang Bash.&amp;quot;"/></head></html>""",
+            "parsed": "Foo&nbsp;Bar, &quot;Biz Bang Bash.&quot;",
+            "decoded": 'Foo Bar, "Biz Bang Bash."',
         },
     }
 
@@ -685,7 +685,7 @@ def test_complex_html(self):
         dc_subject = parsed.metadata["dc"]["Subject"]
         self.assertIs(type(dc_subject), list)
         self.assertEqual(len(dc_subject), len(dcSubjectsExpected))
-        for (idx, _expected) in enumerate(dc_subject):
+        for idx, _expected in enumerate(dc_subject):
             self.assertIs(type(dc_subject[idx]), dict)
             self.assertEqual(
                 len(dc_subject[idx].keys()), len(dcSubjectsExpected[idx].keys())
@@ -785,7 +785,7 @@ def test_complex_html(self):
         dc_mixed_candidates = parsed.metadata["dc"]["TestMixedCandidates2a"]
         self.assertIs(type(dc_mixed_candidates), list)
         self.assertEqual(len(dc_mixed_candidates), len(dcTestMixedCandidates2aExpected))
-        for (idx, _expected) in enumerate(dc_mixed_candidates):
+        for idx, _expected in enumerate(dc_mixed_candidates):
             self.assertIs(type(dc_mixed_candidates[idx]), dict)
             self.assertEqual(
                 len(dc_mixed_candidates[idx].keys()),
@@ -831,7 +831,7 @@ def test_complex_html(self):
         dc_mixed_candidates = parsed.metadata["dc"]["TestMixedCandidates2b"]
         self.assertIs(type(dc_mixed_candidates), list)
         self.assertEqual(len(dc_mixed_candidates), len(dcTestMixedCandidates2bExpected))
-        for (idx, _expected) in enumerate(dc_mixed_candidates):
+        for idx, _expected in enumerate(dc_mixed_candidates):
             self.assertIs(type(dc_mixed_candidates[idx]), dict)
             self.assertEqual(
                 len(dc_mixed_candidates[idx].keys()),

diff --git a/tests/test_responses.py b/tests/test_responses.py
@@ -9,7 +9,6 @@
 
 # local
 from metadata_parser import derive_encoding__hook
-from ._compat import PY2
 
 # ==============================================================================
 
@@ -49,9 +48,7 @@ def test_simple_encoding_found(self):
                 _content_type = "text/html"
                 if _header:
                     _content_type = "text/html; charset=%s" % _header
-                if PY2:
-                    _body_char = _body_char.decode("utf-8")
-                _body = u"<html><head></head><body>%s</body></html>" % _body_char
+                _body = "<html><head></head><body>%s</body></html>" % _body_char
                 rsps.add(
                     responses.GET,
                     url,
@@ -64,12 +61,10 @@ def test_simple_encoding_found(self):
             # set up the meta tests
             for url in URLS_META.keys():
                 (_header, _expected, _body_char) = URLS_META[url]
-                if PY2:
-                    _body_char = _body_char.decode("utf-8")
-                _body = u"<html><head></head><body>%s</body></html>" % _body_char
+                _body = "<html><head></head><body>%s</body></html>" % _body_char
                 if _header:
                     _body = (
-                        u'<html><head><meta charset="%s"></head><body>%s</body></html>'
+                        '<html><head><meta charset="%s"></head><body>%s</body></html>'
                         % (_header, _body_char)
                     )
                 rsps.add(

diff --git a/tests/test_url_parsing.py b/tests/test_url_parsing.py
@@ -2,11 +2,10 @@
 
 # stdlib
 import unittest
+from urllib.parse import urlparse
 
 # local
 import metadata_parser
-from ._compat import PY2
-from ._compat import urlparse
 
 # ==============================================================================
 
@@ -391,14 +390,9 @@ def test_fix_unicode_path(self):
                 "https://example.com/2017/12/abcdefg%C3%BChijklmnop?a=%20foo",
             ),
         )
-        for (raw, expected) in _test_pairs:
+        for raw, expected in _test_pairs:
             cleaned = metadata_parser.fix_unicode_url(raw)
             self.assertEqual(cleaned, expected)
-            if PY2:
-                cleaned = metadata_parser.fix_unicode_url(
-                    raw.decode("utf-8"), encoding="utf-8"
-                ).encode("utf-8")
-                self.assertEqual(cleaned, expected)
 
     def test_fix_unicode_path_leave_unicode_kwargs(self):
         _test_pairs = (
@@ -407,14 +401,9 @@ def test_fix_unicode_path_leave_unicode_kwargs(self):
                 "https://example.com/2017/12/abcdefg%C3%BChijklmnop?a=%20foo&b=ü",
             ),
         )
-        for (raw, expected) in _test_pairs:
+        for raw, expected in _test_pairs:
             cleaned = metadata_parser.fix_unicode_url(raw)
             self.assertEqual(cleaned, expected)
-            if PY2:
-                cleaned = metadata_parser.fix_unicode_url(
-                    raw.decode("utf-8"), encoding="utf-8"
-                ).encode("utf-8")
-                self.assertEqual(cleaned, expected)
 
 
 class TestArgsExceptions(unittest.TestCase, _DocumentCanonicalsMixin):