uritools 4.0.2__tar.gz → 4.0.3__tar.gz

{uritools-4.0.2 → uritools-4.0.3}/CHANGELOG.rst

@@ -1,3 +1,9 @@
+v4.0.3 (2024-05-28)
+===================
+
+- Prepare for Python 3.13.
+
+
 v4.0.2 (2023-08-30)
 ===================
 

{uritools-4.0.2 → uritools-4.0.3}/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2022 Thomas Kemmer
+Copyright (c) 2014-2024 Thomas Kemmer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

{uritools-4.0.2 → uritools-4.0.3}/MANIFEST.in

@@ -3,6 +3,7 @@ include LICENSE
 include MANIFEST.in
 include README.rst
 include tox.ini
+exclude .readthedocs.yaml
 
 recursive-include docs *
 prune docs/_build

{uritools-4.0.2/src/uritools.egg-info → uritools-4.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uritools
-Version: 4.0.2
+Version: 4.0.3
 Summary: URI parsing, classification and composition
 Home-page: https://github.com/tkem/uritools/
 Author: Thomas Kemmer

uritools-4.0.3/docs/conf.py

@@ -0,0 +1,33 @@
+import pathlib
+import sys
+
+src_directory = (pathlib.Path(__file__).parent.parent / "src").resolve()
+sys.path.insert(0, str(src_directory))
+
+
+# Extract the current version from the source.
+def get_version():
+    """Get the version and release from the source code."""
+
+    text = (src_directory / "uritools/__init__.py").read_text()
+    for line in text.splitlines():
+        if not line.strip().startswith("__version__"):
+            continue
+        full_version = line.partition("=")[2].strip().strip("\"'")
+        partial_version = ".".join(full_version.split(".")[:2])
+        return full_version, partial_version
+
+
+project = "uritools"
+copyright = "2014-2024 Thomas Kemmer"
+release, version = get_version()
+
+extensions = [
+    "sphinx.ext.autodoc",
+    "sphinx.ext.coverage",
+    "sphinx.ext.doctest",
+    "sphinx.ext.todo",
+]
+exclude_patterns = ["_build"]
+master_doc = "index"
+html_theme = "classic"

{uritools-4.0.2 → uritools-4.0.3}/setup.cfg

@@ -5,7 +5,7 @@ url = https://github.com/tkem/uritools/
 author = Thomas Kemmer
 author_email = tkemmer@computer.org
 license = MIT
-license_file = LICENSE
+license_files = LICENSE
 description = URI parsing, classification and composition
 long_description = file: README.rst
 classifiers = 

{uritools-4.0.2 → uritools-4.0.3}/src/uritools/__init__.py

@@ -34,7 +34,7 @@ __all__ = (
     "uriunsplit",
 )
 
-__version__ = "4.0.2"
+__version__ = "4.0.3"
 
 
 # RFC 3986 2.2.  Reserved Characters

{uritools-4.0.2 → uritools-4.0.3/src/uritools.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uritools
-Version: 4.0.2
+Version: 4.0.3
 Summary: URI parsing, classification and composition
 Home-page: https://github.com/tkem/uritools/
 Author: Thomas Kemmer

{uritools-4.0.2 → uritools-4.0.3}/tests/test_split.py

@@ -406,52 +406,133 @@ class SplitTest(unittest.TestCase):
                 "Error parsing query list for %r" % query,
             )
 
-    def test_ip_literal(self):
+    def test_ipv4_literal(self):
         cases = [
-            ("http://Test.python.org:5432/foo/", "test.python.org", 5432),
+            ("http://12.34.56.78/foo/", "12.34.56.78", None),
+            ("http://12.34.56.78:/foo/", "12.34.56.78", None),
             ("http://12.34.56.78:5432/foo/", "12.34.56.78", 5432),
-            ("http://[::1]:5432/foo/", "::1", 5432),
-            ("http://[dead:beef::1]:5432/foo/", "dead:beef::1", 5432),
-            ("http://[dead:beef::]:5432/foo/", "dead:beef::", 5432),
+        ]
+        for uri, host, port in cases:
+            for parts in (urisplit(uri), urisplit(uri.encode("ascii"))):
+                self.assertEqual(host, str(parts.gethost()))
+                self.assertEqual(port, parts.getport())
+
+    def test_ipv6_literal(self):
+        cases = [
+            ("http://[::1]:5432/foo/", "0000:0000:0000:0000:0000:0000:0000:0001", 5432),
+            (
+                "http://[dead:beef::1]:5432/foo/",
+                "dead:beef:0000:0000:0000:0000:0000:0001",
+                5432,
+            ),
+            (
+                "http://[dead:beef::]:5432/foo/",
+                "dead:beef:0000:0000:0000:0000:0000:0000",
+                5432,
+            ),
             (
                 "http://[dead:beef:cafe:5417:affe:8FA3:deaf:feed]:5432/foo/",
                 "dead:beef:cafe:5417:affe:8fa3:deaf:feed",
                 5432,
             ),
-            ("http://[::12.34.56.78]:5432/foo/", "::c22:384e", 5432),
-            ("http://[::ffff:12.34.56.78]:5432/foo/", "::ffff:c22:384e", 5432),
-            ("http://Test.python.org/foo/", "test.python.org", None),
-            ("http://12.34.56.78/foo/", "12.34.56.78", None),
-            ("http://[::1]/foo/", "::1", None),
-            ("http://[dead:beef::1]/foo/", "dead:beef::1", None),
-            ("http://[dead:beef::]/foo/", "dead:beef::", None),
+            ("http://[::1]/foo/", "0000:0000:0000:0000:0000:0000:0000:0001", None),
+            (
+                "http://[dead:beef::1]/foo/",
+                "dead:beef:0000:0000:0000:0000:0000:0001",
+                None,
+            ),
+            (
+                "http://[dead:beef::]/foo/",
+                "dead:beef:0000:0000:0000:0000:0000:0000",
+                None,
+            ),
             (
                 "http://[dead:beef:cafe:5417:affe:8FA3:deaf:feed]/foo/",
                 "dead:beef:cafe:5417:affe:8fa3:deaf:feed",
                 None,
             ),
-            ("http://[::12.34.56.78]/foo/", "::c22:384e", None),
-            ("http://[::ffff:12.34.56.78]/foo/", "::ffff:c22:384e", None),
-            ("http://Test.python.org:/foo/", "test.python.org", None),
-            ("http://12.34.56.78:/foo/", "12.34.56.78", None),
-            ("http://[::1]:/foo/", "::1", None),
-            ("http://[dead:beef::1]:/foo/", "dead:beef::1", None),
-            ("http://[dead:beef::]:/foo/", "dead:beef::", None),
+            ("http://[::1]:/foo/", "0000:0000:0000:0000:0000:0000:0000:0001", None),
+            (
+                "http://[dead:beef::1]:/foo/",
+                "dead:beef:0000:0000:0000:0000:0000:0001",
+                None,
+            ),
+            (
+                "http://[dead:beef::]:/foo/",
+                "dead:beef:0000:0000:0000:0000:0000:0000",
+                None,
+            ),
             (
                 "http://[dead:beef:cafe:5417:affe:8FA3:deaf:feed]:/foo/",
                 "dead:beef:cafe:5417:affe:8fa3:deaf:feed",
                 None,
             ),
-            ("http://[::12.34.56.78]:/foo/", "::c22:384e", None),
-            ("http://[::ffff:12.34.56.78]:/foo/", "::ffff:c22:384e", None),
         ]
         for uri, host, port in cases:
+            for parts in (urisplit(uri), urisplit(uri.encode("ascii"))):
+                self.assertEqual(host, parts.gethost().exploded)
+                self.assertEqual(port, parts.getport())
+
+    def test_ipv4_mapped_literal(self):
+        # since Python 3.13, the "alternative form" is used for
+        # IPv4-mapped addresses, see RFC 4291 2.2 p.3
+        cases = [
+            (
+                "http://[::12.34.56.78]:5432/foo/",
+                [
+                    "0000:0000:0000:0000:0000:0000:0c22:384e",
+                    "0000:0000:0000:0000:0000:0000:12.34.56.78",
+                ],
+                5432,
+            ),
+            (
+                "http://[::ffff:12.34.56.78]:5432/foo/",
+                [
+                    "0000:0000:0000:0000:0000:ffff:0c22:384e",
+                    "0000:0000:0000:0000:0000:ffff:12.34.56.78",
+                ],
+                5432,
+            ),
+            (
+                "http://[::12.34.56.78]/foo/",
+                [
+                    "0000:0000:0000:0000:0000:0000:0c22:384e",
+                    "0000:0000:0000:0000:0000:0000:12.34.56.78",
+                ],
+                None,
+            ),
+            (
+                "http://[::ffff:12.34.56.78]/foo/",
+                [
+                    "0000:0000:0000:0000:0000:ffff:0c22:384e",
+                    "0000:0000:0000:0000:0000:ffff:12.34.56.78",
+                ],
+                None,
+            ),
+            (
+                "http://[::12.34.56.78]:/foo/",
+                [
+                    "0000:0000:0000:0000:0000:0000:0c22:384e",
+                    "0000:0000:0000:0000:0000:0000:12.34.56.78",
+                ],
+                None,
+            ),
+            (
+                "http://[::ffff:12.34.56.78]:/foo/",
+                [
+                    "0000:0000:0000:0000:0000:ffff:0c22:384e",
+                    "0000:0000:0000:0000:0000:ffff:12.34.56.78",
+                ],
+                None,
+            ),
+        ]
+        for uri, hosts, port in cases:
             parts = urisplit(uri)
-            self.assertEqual(host, str(parts.gethost()))
-            self.assertEqual(port, parts.getport())
+            self.assertIn(parts.gethost().exploded, hosts)
+            self.assertEqual(parts.getport(), port)
             parts = urisplit(uri.encode("ascii"))
-            self.assertEqual(host, str(parts.gethost()))
-            self.assertEqual(port, parts.getport())
+            self.assertIn(parts.gethost().exploded, hosts)
+            self.assertEqual(parts.getport(), port)
 
     def test_invalid_ip_literal(self):
         uris = [

{uritools-4.0.2 → uritools-4.0.3}/tox.ini

@@ -3,7 +3,6 @@ envlist = check-manifest,docs,doctest,flake8,py
 
 [testenv]
 deps =
-    coverage
     pytest
     pytest-cov
 commands =

uritools-4.0.2/docs/conf.py

@@ -1,14 +0,0 @@
-project = "uritools"
-copyright = "2014-2023 Thomas Kemmer"
-version = "4.0"
-release = "4.0.2"
-
-extensions = [
-    "sphinx.ext.autodoc",
-    "sphinx.ext.coverage",
-    "sphinx.ext.doctest",
-    "sphinx.ext.todo",
-]
-exclude_patterns = ["_build"]
-master_doc = "index"
-html_theme = "default"