Skip to content

Fix Python 3.13 compatibility with pathlib #61 #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
monozoide merged 1 commit into from
Oct 16, 2025
Merged

Fix Python 3.13 compatibility with pathlib #61 #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions lib/maillogsentinel/sql_exporter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,9 +396,17 @@ def run_sql_export(config: AppConfig, output_log_level: str = "INFO") -> bool:
f"{LOG_PREFIX}: No user-specific column mapping file configured, attempting to load bundled default."
)
try:
with importlib.resources.files("lib.maillogsentinel.data").joinpath(
"maillogsentinel_sql_column_mapping.json"
) as bundled_path:
# Correctly handle importlib.resources for Python 3.9+
# The 'with' statement for pathlib.Path is removed in Python 3.13
# We get a Traversable object, which we can convert to a Path
bundled_path_traversable = importlib.resources.files(
"lib.maillogsentinel.data"
).joinpath("maillogsentinel_sql_column_mapping.json")

# For older importlib_resources, we might need to use 'as_file' context manager
# but for modern Python, this direct conversion to Path is often sufficient
# if the resource is a file on the filesystem.
with importlib.resources.as_file(bundled_path_traversable) as bundled_path:
if (
not bundled_path.is_file()
): # Should not happen if packaged correctly
Expand Down Expand Up @@ -711,9 +719,10 @@ def _create_dummy_csv(

def _get_bundled_mapping_headers_for_test():
try:
with importlib.resources.files("lib.maillogsentinel.data").joinpath(
"maillogsentinel_sql_column_mapping.json"
) as bundled_path_ref:
bundled_path_traversable = importlib.resources.files(
"lib.maillogsentinel.data"
).joinpath("maillogsentinel_sql_column_mapping.json")
with importlib.resources.as_file(bundled_path_traversable) as bundled_path_ref:
# The object returned by importlib.resources.files() is a Traversable
# We need to ensure it's treated as a Path object for load_column_mapping
mapping = load_column_mapping(Path(bundled_path_ref))
Expand Down
15 changes: 9 additions & 6 deletions lib/maillogsentinel/sql_importer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,12 +331,15 @@ def run_sql_import(config: AppConfig, output_log_level: str = "INFO") -> bool:
f"{LOG_PREFIX}: No user-specific column mapping file configured, attempting to load bundled default."
)
try:
with importlib.resources.files("lib.maillogsentinel.data").joinpath(
"maillogsentinel_sql_column_mapping.json"
) as bundled_path_traversable:
final_mapping_file_path = Path(
bundled_path_traversable
) # Convert Traversable to Path
bundled_path_traversable = importlib.resources.files(
"lib.maillogsentinel.data"
).joinpath("maillogsentinel_sql_column_mapping.json")
with importlib.resources.as_file(
bundled_path_traversable
) as resolved_bundled_path:
final_mapping_file_path = (
resolved_bundled_path # This is now a concrete Path
)
if not final_mapping_file_path.is_file():
logger.critical(
f"{LOG_PREFIX}: Bundled column mapping file not found at expected location via importlib.resources: {final_mapping_file_path}. This indicates a packaging issue. Aborting SQL import."
Expand Down