Merge pull request #314 from ASFHyP3/develop

Release v3.1.2

.github/workflows/test.yml

@@ -17,4 +17,4 @@ jobs:
     with:
       local_package_name: hyp3lib
       python_versions: >-
-        ["3.10", "3.11", "3.12"]
+        ["3.10", "3.11", "3.12", "3.13"]

CHANGELOG.md

@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [PEP 440](https://www.python.org/dev/peps/pep-0440/)
 and uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.1.2]
+
+### Fixed
+* Support Python 3.13 by replacing the `cgi` module with the `email.message` module as described in [PEP 594](https://peps.python.org/pep-0594/#cgi). Fixes <https://github.com/ASFHyP3/hyp3-lib/issues/300>.
+
 ## [3.1.1]
 
 ### Fixed

environment.yml

@@ -3,8 +3,7 @@ channels:
   - conda-forge
   - nodefaults
 dependencies:
-  # FIXME: standard lib `cgi` module removed in 3.13: https://github.com/ASFHyP3/hyp3-lib/issues/300
-  - python>=3.10,<3.13
+  - python>=3.10
   - pip
   # For running
   - boto3

pyproject.toml

@@ -4,8 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hyp3lib"
-# FIXME: standard lib `cgi` module removed in 3.13: https://github.com/ASFHyP3/hyp3-lib/issues/300
-requires-python = ">=3.10,<3.13"
+requires-python = ">=3.10"
 readme = "README.md"
 authors = [
     {name="ASF APD/Tools Team", email="[email protected]"},
@@ -21,6 +20,7 @@ classifiers=[
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Software Development :: Libraries",
 ]
 dependencies = [

src/hyp3lib/fetch.py

@@ -1,6 +1,6 @@
 """Utilities for fetching things from external endpoints"""
-import cgi
 import logging
+from email.message import Message
 from os.path import basename
 from pathlib import Path
 from typing import Optional, Tuple, Union
@@ -29,8 +29,9 @@ def write_credentials_to_netrc_file(
 def _get_download_path(url: str, content_disposition: str = None, directory: Union[Path, str] = '.'):
     filename = None
     if content_disposition is not None:
-        _, params = cgi.parse_header(content_disposition)
-        filename = params.get('filename')
+        message = Message()
+        message['content-type'] = content_disposition
+        filename = message.get_param('filename')
     if not filename:
         filename = basename(urlparse(url).path)
     if not filename: