Skip to content

Python 3.12 compatibility #33

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

Open
borutmrak wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Python 3.12 compatibility #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fb4701
replace the imp library import for compatiblity with python 3.12+
Jun 5, 2025
751b0e1
bumped version so it installs from local file instead of pypi
Jun 6, 2025
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
19 changes: 16 additions & 3 deletions policyd_rate_limit/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
import collections
import ipaddress
import time
import imp
import importlib.util
import importlib.machinery
import pwd
import grp
import warnings
Expand All @@ -35,6 +36,18 @@ def ip_network(ip_str):
return ipaddress.IPv6Network(ip_str)



def load_source(modname, filename):
# Replacing imp.load_source() according to https://docs.python.org/3/whatsnew/3.12.html#imp
loader = importlib.machinery.SourceFileLoader(modname, filename)
spec = importlib.util.spec_from_file_location(modname, filename, loader=loader)
module = importlib.util.module_from_spec(spec)
# The module is always executed and not cached in sys.modules.
# Uncomment the following line to cache the module.
# sys.modules[module.__name__] = module
loader.exec_module(module)
return module

class Exit(Exception):
pass

Expand Down Expand Up @@ -63,15 +76,15 @@ def __init__(self, config_file=None):
try:
# compatibility with old config style in a python module
if config_file.endswith(".conf"): # pragma: no cover (deprecated)
self._config = imp.load_source('config', config_file)
self._config = load_source('config', config_file)
warnings.warn(
(
"New configuration use a .yaml file. "
"Please migrate to it and delete you .conf file"
),
stacklevel=3
)
cache_file = imp.cache_from_source(config_file)
cache_file = importlib.util.cache_from_source(config_file)
# remove the config pyc file
try:
os.remove(cache_file)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def add_data_file(dir, file, check_dir=False, mkdir=False):

setup(
name='policyd-rate-limit',
version='1.2.0',
version='1.2.1',
description=DESC,
long_description=README,
author='Valentin Samir',
Expand Down