tldextract 5.0.1__tar.gz → 5.1.1__tar.gz

tldextract-5.1.1/.github/workflows/ci.yml

@@ -0,0 +1,40 @@
+name: build
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-latest, windows-latest, ubuntu-latest]
+        language:
+          [
+            {python-version: "3.8", toxenv: "py38"},
+            {python-version: "3.9", toxenv: "py39"},
+            {python-version: "3.10", toxenv: "py310"},
+            {python-version: "3.11", toxenv: "py311"},
+            {python-version: "3.12", toxenv: "py312"},
+            {python-version: "pypy3.8", toxenv: "pypy38"},
+          ]
+        include:
+          - os: ubuntu-latest
+            language: {python-version: "3.8", toxenv: "codestyle"}
+          - os: ubuntu-latest
+            language: {python-version: "3.8", toxenv: "lint"}
+          - os: ubuntu-latest
+            language: {python-version: "3.8", toxenv: "typecheck"}
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.language.python-version }}
+      - name: Install Python requirements
+        run: |
+          pip install --upgrade pip
+          pip install --upgrade --editable '.[testing]'
+      - name: Test
+        run: tox
+        env:
+          TOXENV: ${{ matrix.language.toxenv }}

{tldextract-5.0.1 → tldextract-5.1.1}/CHANGELOG.md

@@ -3,6 +3,23 @@
 After upgrading, update your cache file by deleting it or via `tldextract
 --update`.
 
+## 5.1.1 (2023-11-16)
+
+* Bugfixes
+  * Fix path join on Windows ([#314](https://github.com/john-kurkowski/tldextract/issues/314))
+  * Support Python 3.12
+
+## 5.1.0 (2023-11-05)
+
+* Features
+    * Allow passing in `requests.Session` ([#311](https://github.com/john-kurkowski/tldextract/issues/311))
+    * Add "-j, --json" option to support output in json format ([#313](https://github.com/john-kurkowski/tldextract/issues/313))
+* Docs
+    * Improve clarity of absolute path ([#312](https://github.com/john-kurkowski/tldextract/issues/312))
+* Misc.
+    * Extract all testing deps from tox.ini to pyproject.toml extras ([#310](https://github.com/john-kurkowski/tldextract/issues/310))
+    * Work around responses type union error, in tests
+
 ## 5.0.1 (2023-10-17)
 
 * Bugfixes

{tldextract-5.0.1 → tldextract-5.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tldextract
-Version: 5.0.1
+Version: 5.1.1
 Summary: Accurately separates a URL's subdomain, domain, and public suffix, using the Public Suffix List (PSL). By default, this includes the public ICANN TLDs and their exceptions. You can optionally support the Public Suffix List's private domains as well.
 Author-email: John Kurkowski <john.kurkowski@gmail.com>
 License: BSD-3-Clause
@@ -14,6 +14,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -21,8 +22,19 @@ Requires-Dist: idna
 Requires-Dist: requests>=2.1.0
 Requires-Dist: requests-file>=1.4
 Requires-Dist: filelock>=3.0.8
-
-# tldextract [![PyPI version](https://badge.fury.io/py/tldextract.svg)](https://badge.fury.io/py/tldextract) [![Build Status](https://travis-ci.com/john-kurkowski/tldextract.svg?branch=master)](https://app.travis-ci.com/github/john-kurkowski/tldextract)
+Provides-Extra: testing
+Requires-Dist: black; extra == "testing"
+Requires-Dist: mypy; extra == "testing"
+Requires-Dist: pytest; extra == "testing"
+Requires-Dist: pytest-gitignore; extra == "testing"
+Requires-Dist: pytest-mock; extra == "testing"
+Requires-Dist: responses; extra == "testing"
+Requires-Dist: ruff; extra == "testing"
+Requires-Dist: tox; extra == "testing"
+Requires-Dist: types-filelock; extra == "testing"
+Requires-Dist: types-requests; extra == "testing"
+
+# tldextract [![PyPI version](https://badge.fury.io/py/tldextract.svg)](https://badge.fury.io/py/tldextract) [![Build Status](https://github.com/john-kurkowski/tldextract/actions/workflows/ci.yml/badge.svg)](https://github.com/john-kurkowski/tldextract/actions/workflows/ci.yml)
 
 `tldextract` accurately separates a URL's subdomain, domain, and public suffix,
 using [the Public Suffix List (PSL)](https://publicsuffix.org).
@@ -210,7 +222,7 @@ If you want to use input data from your local filesystem, just use the `file://`
 
 ```python
 extract = tldextract.TLDExtract(
-    suffix_list_urls=["file://absolute/path/to/your/local/suffix/list/file"],
+    suffix_list_urls=["file://" + "/absolute/path/to/your/local/suffix/list/file"],
     cache_dir='/path/to/your/cache/',
     fallback_to_snapshot=False)
 ```
@@ -271,7 +283,7 @@ receiving exceptions or error metadata on results.
 
 1. `git clone` this repository.
 2. Change into the new directory.
-3. `pip install tox`
+3. `pip install --upgrade --editable '.[testing]'`
 
 ### Running the test suite
 
@@ -293,6 +305,5 @@ tox -e py311
 Automatically format all code:
 
 ```zsh
-pip install black
 black .
 ```

{tldextract-5.0.1 → tldextract-5.1.1}/README.md

@@ -1,4 +1,4 @@
-# tldextract [![PyPI version](https://badge.fury.io/py/tldextract.svg)](https://badge.fury.io/py/tldextract) [![Build Status](https://travis-ci.com/john-kurkowski/tldextract.svg?branch=master)](https://app.travis-ci.com/github/john-kurkowski/tldextract)
+# tldextract [![PyPI version](https://badge.fury.io/py/tldextract.svg)](https://badge.fury.io/py/tldextract) [![Build Status](https://github.com/john-kurkowski/tldextract/actions/workflows/ci.yml/badge.svg)](https://github.com/john-kurkowski/tldextract/actions/workflows/ci.yml)
 
 `tldextract` accurately separates a URL's subdomain, domain, and public suffix,
 using [the Public Suffix List (PSL)](https://publicsuffix.org).
@@ -186,7 +186,7 @@ If you want to use input data from your local filesystem, just use the `file://`
 
 ```python
 extract = tldextract.TLDExtract(
-    suffix_list_urls=["file://absolute/path/to/your/local/suffix/list/file"],
+    suffix_list_urls=["file://" + "/absolute/path/to/your/local/suffix/list/file"],
     cache_dir='/path/to/your/cache/',
     fallback_to_snapshot=False)
 ```
@@ -247,7 +247,7 @@ receiving exceptions or error metadata on results.
 
 1. `git clone` this repository.
 2. Change into the new directory.
-3. `pip install tox`
+3. `pip install --upgrade --editable '.[testing]'`
 
 ### Running the test suite
 
@@ -269,6 +269,5 @@ tox -e py311
 Automatically format all code:
 
 ```zsh
-pip install black
 black .
 ```

{tldextract-5.0.1 → tldextract-5.1.1}/pyproject.toml

@@ -27,16 +27,32 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
 ]
 requires-python = ">=3.8"
+dynamic = ["version"]
+readme = "README.md"
+
 dependencies = [
     "idna",
     "requests>=2.1.0",
     "requests-file>=1.4",
     "filelock>=3.0.8",
 ]
-dynamic = ["version"]
-readme = "README.md"
+
+[project.optional-dependencies]
+testing = [
+    "black",
+    "mypy",
+    "pytest",
+    "pytest-gitignore",
+    "pytest-mock",
+    "responses",
+    "ruff",
+    "tox",
+    "types-filelock",
+    "types-requests",
+]
 
 [project.urls]
 Homepage = "https://github.com/john-kurkowski/tldextract"

{tldextract-5.0.1 → tldextract-5.1.1}/tests/cli_test.py

@@ -1,5 +1,6 @@
 """tldextract integration tests."""
 
+import json
 import sys
 
 import pytest
@@ -63,3 +64,25 @@ def test_cli_namedargs(
     stdout, stderr = capsys.readouterr()
     assert not stderr
     assert stdout == " example com\n bbc co.uk\nforums bbc co.uk\n"
+
+
+def test_cli_json_output(
+    capsys: pytest.CaptureFixture[str], monkeypatch: pytest.MonkeyPatch
+) -> None:
+    """Test CLI with --json option."""
+    monkeypatch.setattr(sys, "argv", ["tldextract", "--json", "www.bbc.co.uk"])
+
+    main()
+
+    stdout, stderr = capsys.readouterr()
+    assert not stderr
+    assert json.loads(stdout) == {
+        "subdomain": "www",
+        "domain": "bbc",
+        "suffix": "co.uk",
+        "fqdn": "www.bbc.co.uk",
+        "ipv4": "",
+        "ipv6": "",
+        "is_private": False,
+        "registered_domain": "bbc.co.uk",
+    }

{tldextract-5.0.1 → tldextract-5.1.1}/tests/custom_suffix_test.py

@@ -2,13 +2,17 @@
 
 import os
 import tempfile
+from pathlib import Path
 
 import tldextract
 from tldextract.tldextract import ExtractResult
 
-FAKE_SUFFIX_LIST_URL = "file://" + os.path.join(
-    os.path.dirname(os.path.abspath(__file__)), "fixtures/fake_suffix_list_fixture.dat"
-)
+FAKE_SUFFIX_LIST_URL = Path(
+    os.path.dirname(os.path.abspath(__file__)),
+    "fixtures",
+    "fake_suffix_list_fixture.dat",
+).as_uri()
+
 EXTRA_SUFFIXES = ["foo1", "bar1", "baz1"]
 
 extract_using_fake_suffix_list = tldextract.TLDExtract(

{tldextract-5.0.1 → tldextract-5.1.1}/tests/main_test.py

@@ -8,6 +8,7 @@ import tempfile
 from collections.abc import Sequence
 from pathlib import Path
 from typing import Any
+from unittest.mock import Mock
 
 import pytest
 import pytest_mock
@@ -449,6 +450,34 @@ def test_cache_timeouts(tmp_path: Path) -> None:
         tldextract.suffix_list.find_first_response(cache, [server], 5)
 
 
+@responses.activate
+def test_find_first_response_without_session(tmp_path: Path) -> None:
+    """Test it is able to find first response without session passed in."""
+    server = "http://some-server.com"
+    response_text = "server response"
+    responses.add(responses.GET, server, status=200, body=response_text)
+    cache = DiskCache(str(tmp_path))
+
+    result = tldextract.suffix_list.find_first_response(cache, [server], 5)
+    assert result == response_text
+
+
+def test_find_first_response_with_session(tmp_path: Path) -> None:
+    """Test it is able to find first response with passed in session."""
+    server = "http://some-server.com"
+    response_text = "server response"
+    cache = DiskCache(str(tmp_path))
+    mock_session = Mock()
+    mock_session.get.return_value.text = response_text
+
+    result = tldextract.suffix_list.find_first_response(
+        cache, [server], 5, mock_session
+    )
+    assert result == response_text
+    mock_session.get.assert_called_once_with(server, timeout=5)
+    mock_session.close.assert_not_called()
+
+
 def test_include_psl_private_domain_attr() -> None:
     """Test private domains, which default to not being treated differently."""
     extract_private = tldextract.TLDExtract(include_psl_private_domains=True)

{tldextract-5.0.1 → tldextract-5.1.1}/tests/test_cache.py

@@ -1,7 +1,6 @@
 """Test the caching functionality."""
 from __future__ import annotations
 
-import os.path
 import sys
 import types
 from collections.abc import Hashable
@@ -56,14 +55,14 @@ def test_get_cache_dir(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.delenv("HOME", raising=False)
     monkeypatch.delenv("XDG_CACHE_HOME", raising=False)
     monkeypatch.delenv("TLDEXTRACT_CACHE", raising=False)
-    assert get_cache_dir().endswith("tldextract/.suffix_cache/")
+    assert get_cache_dir().endswith(str(Path("tldextract", ".suffix_cache")))
 
     # with home set, but not anything else specified, use XDG_CACHE_HOME default
     monkeypatch.setenv("HOME", "/home/john")
     monkeypatch.delenv("XDG_CACHE_HOME", raising=False)
     monkeypatch.delenv("TLDEXTRACT_CACHE", raising=False)
-    assert get_cache_dir() == os.path.join(
-        "/home/john", ".cache/python-tldextract", pkg_identifier
+    assert get_cache_dir() == str(
+        Path("/home/john", ".cache/python-tldextract", pkg_identifier)
     )
 
     # if XDG_CACHE_HOME is set, use it
@@ -71,8 +70,8 @@ def test_get_cache_dir(monkeypatch: pytest.MonkeyPatch) -> None:
     monkeypatch.setenv("XDG_CACHE_HOME", "/my/alt/cache")
     monkeypatch.delenv("TLDEXTRACT_CACHE", raising=False)
 
-    assert get_cache_dir() == os.path.join(
-        "/my/alt/cache/python-tldextract", pkg_identifier
+    assert get_cache_dir() == str(
+        Path("/my/alt/cache/python-tldextract", pkg_identifier)
     )
 
     # if TLDEXTRACT_CACHE is set, use it

{tldextract-5.0.1 → tldextract-5.1.1}/tests/test_parallel.py

@@ -1,6 +1,8 @@
 """Test ability to run in parallel with shared cache."""
+
+from __future__ import annotations
+
 import os
-import os.path
 from multiprocessing import Pool
 from pathlib import Path
 
@@ -19,14 +21,15 @@ def test_multiprocessing_makes_one_request(tmp_path: Path) -> None:
     assert sum(http_request_counts) == 1
 
 
-@responses.activate
 def _run_extractor(cache_dir: Path) -> int:
     """Run the extractor."""
-    responses.add(responses.GET, PUBLIC_SUFFIX_LIST_URLS[0], status=208, body="uk.co")
-    extract = TLDExtract(cache_dir=str(cache_dir))
+    with responses.RequestsMock(assert_all_requests_are_fired=False) as rsps:
+        rsps.add(responses.GET, PUBLIC_SUFFIX_LIST_URLS[0], status=208, body="uk.co")
+        extract = TLDExtract(cache_dir=str(cache_dir))
 
-    extract("bar.uk.com", include_psl_private_domains=True)
-    return len(responses.calls)
+        extract("bar.uk.com", include_psl_private_domains=True)
+        num_calls = len(rsps.calls)
+    return num_calls
 
 
 @responses.activate
@@ -41,9 +44,23 @@ def test_cache_cleared_by_other_process(
     extract("google.com")
     orig_unlink = os.unlink
 
-    def evil_unlink(filename: str) -> None:
+    def is_relative_to(path: Path, other_path: str | Path) -> bool:
+        """Return True if path is relative to other_path or False.
+
+        Taken from the Python 3.9 standard library.
+        Reference: https://docs.python.org/3/library/pathlib.html#pathlib.PurePath.is_relative_to
+        """
+        try:
+            path.relative_to(other_path)
+            return True
+        except ValueError:
+            return False
+
+    def evil_unlink(filename: str | Path) -> None:
         """Simulate someone deletes the file right before we try to."""
-        if filename.startswith(cache_dir):
+        if (isinstance(filename, str) and filename.startswith(cache_dir)) or (
+            isinstance(filename, Path) and is_relative_to(filename, cache_dir)
+        ):
             orig_unlink(filename)
         orig_unlink(filename)
 

{tldextract-5.0.1 → tldextract-5.1.1}/tldextract/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '5.0.1'
-__version_tuple__ = version_tuple = (5, 0, 1)
+__version__ = version = '5.1.1'
+__version_tuple__ = version_tuple = (5, 1, 1)

{tldextract-5.0.1 → tldextract-5.1.1}/tldextract/cache.py

@@ -6,9 +6,9 @@ import hashlib
 import json
 import logging
 import os
-import os.path
 import sys
 from collections.abc import Callable, Hashable, Iterable
+from pathlib import Path
 from typing import (
     TypeVar,
     cast,
@@ -79,15 +79,15 @@ def get_cache_dir() -> str:
     if xdg_cache_home is None:
         user_home = os.getenv("HOME", None)
         if user_home:
-            xdg_cache_home = os.path.join(user_home, ".cache")
+            xdg_cache_home = str(Path(user_home, ".cache"))
 
     if xdg_cache_home is not None:
-        return os.path.join(
-            xdg_cache_home, "python-tldextract", get_pkg_unique_identifier()
+        return str(
+            Path(xdg_cache_home, "python-tldextract", get_pkg_unique_identifier())
         )
 
     # fallback to trying to use package directory itself
-    return os.path.join(os.path.dirname(__file__), ".suffix_cache/")
+    return str(Path(os.path.dirname(__file__), ".suffix_cache"))
 
 
 class DiskCache:
@@ -153,7 +153,7 @@ class DiskCache:
                     self.file_ext + ".lock"
                 ):
                     try:
-                        os.unlink(os.path.join(root, filename))
+                        os.unlink(str(Path(root, filename)))
                     except FileNotFoundError:
                         pass
                     except OSError as exc:
@@ -165,10 +165,10 @@ class DiskCache:
     def _key_to_cachefile_path(
         self, namespace: str, key: str | dict[str, Hashable]
     ) -> str:
-        namespace_path = os.path.join(self.cache_dir, namespace)
+        namespace_path = str(Path(self.cache_dir, namespace))
         hashed_key = _make_cache_key(key)
 
-        cache_path = os.path.join(namespace_path, hashed_key + self.file_ext)
+        cache_path = str(Path(namespace_path, hashed_key + self.file_ext))
 
         return cache_path
 

{tldextract-5.0.1 → tldextract-5.1.1}/tldextract/cli.py

@@ -1,7 +1,8 @@
 """tldextract CLI."""
 
-
 import argparse
+import dataclasses
+import json
 import logging
 import os.path
 import pathlib
@@ -22,6 +23,13 @@ def main() -> None:
     parser.add_argument(
         "--version", action="version", version="%(prog)s " + __version__
     )
+    parser.add_argument(
+        "-j",
+        "--json",
+        default=False,
+        action="store_true",
+        help="output in json format",
+    )
     parser.add_argument(
         "input", metavar="fqdn|url", type=str, nargs="*", help="fqdn or url"
     )
@@ -89,4 +97,15 @@ def main() -> None:
 
     for i in args.input:
         ext = tld_extract(i)
-        print(f"{ext.subdomain} {ext.domain} {ext.suffix}")
+        if args.json:
+            properties = ("fqdn", "ipv4", "ipv6", "registered_domain")
+            print(
+                json.dumps(
+                    {
+                        **dataclasses.asdict(ext),
+                        **{prop: getattr(ext, prop) for prop in properties},
+                    }
+                )
+            )
+        else:
+            print(f"{ext.subdomain} {ext.domain} {ext.suffix}")

{tldextract-5.0.1 → tldextract-5.1.1}/tldextract/suffix_list.py

@@ -31,11 +31,16 @@ def find_first_response(
     cache: DiskCache,
     urls: Sequence[str],
     cache_fetch_timeout: float | int | None = None,
+    session: requests.Session | None = None,
 ) -> str:
     """Decode the first successfully fetched URL, from UTF-8 encoding to Python unicode."""
-    with requests.Session() as session:
+    session_created = False
+    if session is None:
+        session = requests.Session()
         session.mount("file://", FileAdapter())
+        session_created = True
 
+    try:
         for url in urls:
             try:
                 return cache.cached_fetch_url(
@@ -43,6 +48,11 @@ def find_first_response(
                 )
             except requests.exceptions.RequestException:
                 LOG.exception("Exception reading Public Suffix List url %s", url)
+    finally:
+        # Ensure the session is always closed if it's constructed in the method
+        if session_created:
+            session.close()
+
     raise SuffixListNotFound(
         "No remote Public Suffix List found. Consider using a mirror, or avoid this"
         " fetch by constructing your TLDExtract with `suffix_list_urls=()`."
@@ -65,6 +75,7 @@ def get_suffix_lists(
     urls: Sequence[str],
     cache_fetch_timeout: float | int | None,
     fallback_to_snapshot: bool,
+    session: requests.Session | None = None,
 ) -> tuple[list[str], list[str]]:
     """Fetch, parse, and cache the suffix lists."""
     return cache.run_and_cache(
@@ -75,6 +86,7 @@ def get_suffix_lists(
             "urls": urls,
             "cache_fetch_timeout": cache_fetch_timeout,
             "fallback_to_snapshot": fallback_to_snapshot,
+            "session": session,
         },
         hashed_argnames=["urls", "fallback_to_snapshot"],
     )
@@ -85,10 +97,13 @@ def _get_suffix_lists(
     urls: Sequence[str],
     cache_fetch_timeout: float | int | None,
     fallback_to_snapshot: bool,
+    session: requests.Session | None = None,
 ) -> tuple[list[str], list[str]]:
     """Fetch, parse, and cache the suffix lists."""
     try:
-        text = find_first_response(cache, urls, cache_fetch_timeout=cache_fetch_timeout)
+        text = find_first_response(
+            cache, urls, cache_fetch_timeout=cache_fetch_timeout, session=session
+        )
     except SuffixListNotFound as exc:
         if fallback_to_snapshot:
             maybe_pkg_data = pkgutil.get_data("tldextract", ".tld_set_snapshot")

{tldextract-5.0.1 → tldextract-5.1.1}/tldextract/tldextract.py

@@ -44,6 +44,7 @@ from dataclasses import dataclass
 from functools import wraps
 
 import idna
+import requests
 
 from .cache import DiskCache, get_cache_dir
 from .remote import lenient_netloc, looks_like_ip, looks_like_ipv6
@@ -221,13 +222,19 @@ class TLDExtract:
         self._cache = DiskCache(cache_dir)
 
     def __call__(
-        self, url: str, include_psl_private_domains: bool | None = None
+        self,
+        url: str,
+        include_psl_private_domains: bool | None = None,
+        session: requests.Session | None = None,
     ) -> ExtractResult:
         """Alias for `extract_str`."""
-        return self.extract_str(url, include_psl_private_domains)
+        return self.extract_str(url, include_psl_private_domains, session=session)
 
     def extract_str(
-        self, url: str, include_psl_private_domains: bool | None = None
+        self,
+        url: str,
+        include_psl_private_domains: bool | None = None,
+        session: requests.Session | None = None,
     ) -> ExtractResult:
         """Take a string URL and splits it into its subdomain, domain, and suffix components.
 
@@ -238,13 +245,27 @@ class TLDExtract:
         ExtractResult(subdomain='forums.news', domain='cnn', suffix='com', is_private=False)
         >>> extractor.extract_str('http://forums.bbc.co.uk/')
         ExtractResult(subdomain='forums', domain='bbc', suffix='co.uk', is_private=False)
+
+        Allows configuring the HTTP request via the optional `session`
+        parameter. For example, if you need to use a HTTP proxy. See also
+        `requests.Session`.
+
+        >>> import requests
+        >>> session = requests.Session()
+        >>> # customize your session here
+        >>> with session:
+        ...     extractor.extract_str("http://forums.news.cnn.com/", session=session)
+        ExtractResult(subdomain='forums.news', domain='cnn', suffix='com', is_private=False)
         """
-        return self._extract_netloc(lenient_netloc(url), include_psl_private_domains)
+        return self._extract_netloc(
+            lenient_netloc(url), include_psl_private_domains, session=session
+        )
 
     def extract_urllib(
         self,
         url: urllib.parse.ParseResult | urllib.parse.SplitResult,
         include_psl_private_domains: bool | None = None,
+        session: requests.Session | None = None,
     ) -> ExtractResult:
         """Take the output of urllib.parse URL parsing methods and further splits the parsed URL.
 
@@ -260,10 +281,15 @@ class TLDExtract:
         >>> extractor.extract_urllib(urllib.parse.urlsplit('http://forums.bbc.co.uk/'))
         ExtractResult(subdomain='forums', domain='bbc', suffix='co.uk', is_private=False)
         """
-        return self._extract_netloc(url.netloc, include_psl_private_domains)
+        return self._extract_netloc(
+            url.netloc, include_psl_private_domains, session=session
+        )
 
     def _extract_netloc(
-        self, netloc: str, include_psl_private_domains: bool | None
+        self,
+        netloc: str,
+        include_psl_private_domains: bool | None,
+        session: requests.Session | None = None,
     ) -> ExtractResult:
         netloc_with_ascii_dots = (
             netloc.replace("\u3002", "\u002e")
@@ -282,9 +308,9 @@ class TLDExtract:
 
         labels = netloc_with_ascii_dots.split(".")
 
-        suffix_index, is_private = self._get_tld_extractor().suffix_index(
-            labels, include_psl_private_domains=include_psl_private_domains
-        )
+        suffix_index, is_private = self._get_tld_extractor(
+            session=session
+        ).suffix_index(labels, include_psl_private_domains=include_psl_private_domains)
 
         num_ipv4_labels = 4
         if suffix_index == len(labels) == num_ipv4_labels and looks_like_ip(
@@ -297,23 +323,27 @@ class TLDExtract:
         domain = labels[suffix_index - 1] if suffix_index else ""
         return ExtractResult(subdomain, domain, suffix, is_private)
 
-    def update(self, fetch_now: bool = False) -> None:
+    def update(
+        self, fetch_now: bool = False, session: requests.Session | None = None
+    ) -> None:
         """Force fetch the latest suffix list definitions."""
         self._extractor = None
         self._cache.clear()
         if fetch_now:
-            self._get_tld_extractor()
+            self._get_tld_extractor(session=session)
 
     @property
-    def tlds(self) -> list[str]:
+    def tlds(self, session: requests.Session | None = None) -> list[str]:
         """
         Returns the list of tld's used by default.
 
         This will vary based on `include_psl_private_domains` and `extra_suffixes`
         """
-        return list(self._get_tld_extractor().tlds())
+        return list(self._get_tld_extractor(session=session).tlds())
 
-    def _get_tld_extractor(self) -> _PublicSuffixListTLDExtractor:
+    def _get_tld_extractor(
+        self, session: requests.Session | None = None
+    ) -> _PublicSuffixListTLDExtractor:
         """Get or compute this object's TLDExtractor.
 
         Looks up the TLDExtractor in roughly the following order, based on the
@@ -332,6 +362,7 @@ class TLDExtract:
             urls=self.suffix_list_urls,
             cache_fetch_timeout=self.cache_fetch_timeout,
             fallback_to_snapshot=self.fallback_to_snapshot,
+            session=session,
         )
 
         if not any([public_tlds, private_tlds, self.extra_suffixes]):
@@ -400,9 +431,13 @@ class Trie:
 
 @wraps(TLD_EXTRACTOR.__call__)
 def extract(  # noqa: D103
-    url: str, include_psl_private_domains: bool | None = False
+    url: str,
+    include_psl_private_domains: bool | None = False,
+    session: requests.Session | None = None,
 ) -> ExtractResult:
-    return TLD_EXTRACTOR(url, include_psl_private_domains=include_psl_private_domains)
+    return TLD_EXTRACTOR(
+        url, include_psl_private_domains=include_psl_private_domains, session=session
+    )
 
 
 @wraps(TLD_EXTRACTOR.update)

{tldextract-5.0.1 → tldextract-5.1.1}/tldextract.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tldextract
-Version: 5.0.1
+Version: 5.1.1
 Summary: Accurately separates a URL's subdomain, domain, and public suffix, using the Public Suffix List (PSL). By default, this includes the public ICANN TLDs and their exceptions. You can optionally support the Public Suffix List's private domains as well.
 Author-email: John Kurkowski <john.kurkowski@gmail.com>
 License: BSD-3-Clause
@@ -14,6 +14,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -21,8 +22,19 @@ Requires-Dist: idna
 Requires-Dist: requests>=2.1.0
 Requires-Dist: requests-file>=1.4
 Requires-Dist: filelock>=3.0.8
-
-# tldextract [![PyPI version](https://badge.fury.io/py/tldextract.svg)](https://badge.fury.io/py/tldextract) [![Build Status](https://travis-ci.com/john-kurkowski/tldextract.svg?branch=master)](https://app.travis-ci.com/github/john-kurkowski/tldextract)
+Provides-Extra: testing
+Requires-Dist: black; extra == "testing"
+Requires-Dist: mypy; extra == "testing"
+Requires-Dist: pytest; extra == "testing"
+Requires-Dist: pytest-gitignore; extra == "testing"
+Requires-Dist: pytest-mock; extra == "testing"
+Requires-Dist: responses; extra == "testing"
+Requires-Dist: ruff; extra == "testing"
+Requires-Dist: tox; extra == "testing"
+Requires-Dist: types-filelock; extra == "testing"
+Requires-Dist: types-requests; extra == "testing"
+
+# tldextract [![PyPI version](https://badge.fury.io/py/tldextract.svg)](https://badge.fury.io/py/tldextract) [![Build Status](https://github.com/john-kurkowski/tldextract/actions/workflows/ci.yml/badge.svg)](https://github.com/john-kurkowski/tldextract/actions/workflows/ci.yml)
 
 `tldextract` accurately separates a URL's subdomain, domain, and public suffix,
 using [the Public Suffix List (PSL)](https://publicsuffix.org).
@@ -210,7 +222,7 @@ If you want to use input data from your local filesystem, just use the `file://`
 
 ```python
 extract = tldextract.TLDExtract(
-    suffix_list_urls=["file://absolute/path/to/your/local/suffix/list/file"],
+    suffix_list_urls=["file://" + "/absolute/path/to/your/local/suffix/list/file"],
     cache_dir='/path/to/your/cache/',
     fallback_to_snapshot=False)
 ```
@@ -271,7 +283,7 @@ receiving exceptions or error metadata on results.
 
 1. `git clone` this repository.
 2. Change into the new directory.
-3. `pip install tox`
+3. `pip install --upgrade --editable '.[testing]'`
 
 ### Running the test suite
 
@@ -293,6 +305,5 @@ tox -e py311
 Automatically format all code:
 
 ```zsh
-pip install black
 black .
 ```

{tldextract-5.0.1 → tldextract-5.1.1}/tldextract.egg-info/SOURCES.txt

@@ -1,11 +1,11 @@
 .gitignore
-.travis.yml
 CHANGELOG.md
 LICENSE
 README.md
 pyproject.toml
 tox.ini
 .github/FUNDING.yml
+.github/workflows/ci.yml
 tests/__init__.py
 tests/cli_test.py
 tests/conftest.py

tldextract-5.1.1/tldextract.egg-info/requires.txt

@@ -0,0 +1,16 @@
+idna
+requests>=2.1.0
+requests-file>=1.4
+filelock>=3.0.8
+
+[testing]
+black
+mypy
+pytest
+pytest-gitignore
+pytest-mock
+responses
+ruff
+tox
+types-filelock
+types-requests

{tldextract-5.0.1 → tldextract-5.1.1}/tox.ini

@@ -1,35 +1,22 @@
 [tox]
-envlist = py{38,39,310,311,py3},codestyle,lint,typecheck
+envlist = py{38,39,310,311,312,py38},codestyle,lint,typecheck
 
 [testenv]
-deps =
-    pytest
-    pytest-gitignore
-    pytest-mock
-    responses
 commands = pytest {posargs}
+extras = testing
 
 [testenv:codestyle]
 basepython = python3.8
-deps =
-    black
 commands =
     black --check {posargs:.}
+extras = testing
 
 [testenv:lint]
 basepython = python3.8
-deps =
-    ruff
 commands = ruff check {posargs:.}
+extras = testing
 
 [testenv:typecheck]
 basepython = python3.8
-deps =
-    mypy
-    pytest
-    pytest-gitignore
-    pytest-mock
-    responses
-    types-filelock
-    types-requests
 commands = mypy --show-error-codes tldextract tests
+extras = testing

tldextract-5.0.1/.travis.yml

@@ -1,21 +0,0 @@
-dist: focal
-language: python
-matrix:
-  include:
-    - python: "3.8"
-      env: TOXENV=py38
-    - python: "3.9"
-      env: TOXENV=py39
-    - python: "3.10"
-      env: TOXENV=py310
-    - python: "3.11"
-      env: TOXENV=py311
-    - python: pypy3.8-7.3.9
-      dist: xenial
-      env: TOXENV=pypy3
-    - env: TOXENV=codestyle
-    - env: TOXENV=lint
-    - env: TOXENV=typecheck
-python: "3.10"
-install: pip install tox
-script: tox

tldextract-5.0.1/tldextract.egg-info/requires.txt

@@ -1,4 +0,0 @@
-idna
-requests>=2.1.0
-requests-file>=1.4
-filelock>=3.0.8