Abhilash Raj pushed to branch master at GNU Mailman / Mailman Core
Commits:
b710ad05 by Abhilash Raj at 2020-05-23T13:05:38-07:00
Use the new files API in Python 3.9.
- - - - -
f1bddc84 by Abhilash Raj at 2020-05-23T20:18:40+00:00
Merge branch 'add-3-9' into 'master'
Use the new importlib.resources.files API in Python 3.9
See merge request mailman/mailman!651
- - - - -
1 changed file:
- src/mailman/utilities/filesystem.py
Changes:
=====================================
src/mailman/utilities/filesystem.py
=====================================
@@ -18,6 +18,7 @@
"""Filesystem utilities."""
import os
+import sys
from contextlib import suppress
from public import public
@@ -129,11 +130,18 @@ def path(package, module, *args, **kw):
"""
# Note to packaging teams: This function will handle both standard library
# and 3rd party importlib_resources package. Please do not patch it.
+ if module:
+ module_package = '{}.{}'.format(package, module)
+ else:
+ module_package = package
+
try:
- from importlib.resources import path
- return path(package, module, *args, **kw)
+ if sys.version_info < (3, 9):
+ from importlib.resources import path
+ return path(package, module, *args, **kw)
+ else:
+ from importlib.resources import files # pragma: nocover
+ return files(module_package, *args, **kw) # pragma: nocover
except ImportError: # pragma: nocover
from importlib_resources import files # pragma: nocover
- if module: # pragma: nocover
- package = '{}.{}'.format(package, module) # pragma: nocover
- return files(package, *args, **kw) # pragma: nocover
+ return files(module_package, *args, **kw) # pragma: nocover
View it on GitLab:
https://gitlab.com/mailman/mailman/-/compare/9045262c5d321cc446834b76abe0b7013dff12b2...f1bddc840ecfbe9104fe6e5d90e70d0fa94fa6ba
--
View it on GitLab:
https://gitlab.com/mailman/mailman/-/compare/9045262c5d321cc446834b76abe0b7013dff12b2...f1bddc840ecfbe9104fe6e5d90e70d0fa94fa6ba
You're receiving this email because of your account on gitlab.com.
_______________________________________________
Mailman-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/mailman-checkins.python.org/
Member address: [email protected]
