Remove redundant code for EOL Python versions (#93)

* Add missing 'assert'

* Remove redundant code for EOL Python versions

* Remove unused Travis CI config

* Retain py2 tag in wheels

* Remove assert as we're testing exceptional behavior

Author: hugovk

.travis.yml

@@ -13,7 +13,7 @@ example,
 
     pip install rfc3986
     python -m pip install rfc3986
-    python3.6 -m pip install rfc3986
+    python3.11 -m pip install rfc3986
 
 .. toctree::
     :maxdepth: 2

docs/source/index.rst

@@ -12,7 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Module containing the logic for the URIBuilder object."""
-from . import compat
+from urllib.parse import parse_qsl
+from urllib.parse import urlencode
+
 from . import normalizers
 from . import uri
 from . import uri_reference
@@ -279,7 +281,7 @@ def add_query_from(self, query_items):
                     path=None, query='a=b+c', fragment=None)
 
         """
-        query = normalizers.normalize_query(compat.urlencode(query_items))
+        query = normalizers.normalize_query(urlencode(query_items))
 
         return URIBuilder(
             scheme=self.scheme,
@@ -306,7 +308,7 @@ def extend_query_with(self, query_items):
             URIBuilder(scheme=None, userinfo=None, host=None, port=None,
                     path=None, query='a=b+c&a=b+c', fragment=None)
         """
-        original_query_items = compat.parse_qsl(self.query or "")
+        original_query_items = parse_qsl(self.query or "")
         if not isinstance(query_items, list):
             query_items = list(query_items.items())
 

src/rfc3986/builder.py

@@ -12,42 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """Compatibility module for Python 2 and 3 support."""
-import sys
-
-try:
-    from urllib.parse import quote as urlquote
-except ImportError:  # Python 2.x
-    from urllib import quote as urlquote
-
-try:
-    from urllib.parse import parse_qsl
-except ImportError:  # Python 2.x
-    from urlparse import parse_qsl
-
-try:
-    from urllib.parse import urlencode
-except ImportError:  # Python 2.x
-    from urllib import urlencode
 
 __all__ = (
     "to_bytes",
     "to_str",
-    "urlquote",
-    "urlencode",
-    "parse_qsl",
 )
 
-PY3 = (3, 0) <= sys.version_info < (4, 0)
-PY2 = (2, 6) <= sys.version_info < (2, 8)
-
-
-if PY3:
-    unicode = str  # Python 3.x
-
 
 def to_str(b, encoding="utf-8"):
     """Ensure that b is text in the specified encoding."""
-    if hasattr(b, "decode") and not isinstance(b, unicode):
+    if hasattr(b, "decode") and not isinstance(b, str):
         b = b.decode(encoding)
     return b
 

src/rfc3986/compat.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 """Module with functions to normalize components."""
 import re
+from urllib.parse import quote as urlquote
 
 from . import compat
 from . import misc
@@ -38,12 +39,12 @@ def normalize_authority(authority):
 
 def normalize_username(username):
     """Normalize a username to make it safe to include in userinfo."""
-    return compat.urlquote(username)
+    return urlquote(username)
 
 
 def normalize_password(password):
     """Normalize a password to make safe for userinfo."""
-    return compat.urlquote(password)
+    return urlquote(password)
 
 
 def normalize_host(host):

src/rfc3986/normalizers.py

@@ -67,13 +67,7 @@ def test_iri_equality_special_cases():
     [
         "http://♥.net",
         "http://\u0378.net",
-        pytest.param(
-            "http://㛼.com",
-            marks=pytest.mark.skipif(
-                sys.version_info < (3, 3) and sys.maxunicode <= 0xFFFF,
-                reason="Python configured without UCS-4 support",
-            ),
-        ),
+        "http://㛼.com",
     ],
 )
 def test_encode_invalid_iri(iri):