Skip to content

feat: python 3.12 support #32

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
Expand Down
4 changes: 0 additions & 4 deletions source/ftrack_api/cache.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,15 @@

'''

from future import standard_library
standard_library.install_aliases()
from builtins import str
from six import string_types
from builtins import object
import collections
from six.moves import collections_abc
import functools
import abc
import copy
import inspect
import re
import six

try:
# Python 2.x
Expand Down
2 changes: 0 additions & 2 deletions source/ftrack_api/event/hub.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

from __future__ import absolute_import

from future import standard_library
standard_library.install_aliases()
from builtins import str
from builtins import range
from builtins import object
Expand Down
23 changes: 21 additions & 2 deletions source/ftrack_api/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import collections
import os
import uuid
import imp
import traceback

try:
Expand Down Expand Up @@ -41,6 +40,26 @@ def getfullargspec(func):
annotations={}
)

try:
from imp import load_source

except ImportError:
# The imp module is deprecated in version 3.12. Use importlib instead.
import importlib.util
import importlib.machinery

def load_source(modname, filename):
# https://docs.python.org/3/whatsnew/3.12.html#imp

loader = importlib.machinery.SourceFileLoader(modname, filename)
module = importlib.util.module_from_spec(
importlib.util.spec_from_file_location(modname, filename, loader=loader)
)

loader.exec_module(module)

return module


def discover(paths, positional_arguments=None, keyword_arguments=None):
'''Find and load plugins in search *paths*.
Expand Down Expand Up @@ -77,7 +96,7 @@ def discover(paths, positional_arguments=None, keyword_arguments=None):
unique_name = uuid.uuid4().hex

try:
module = imp.load_source(unique_name, module_path)
module = load_source(unique_name, module_path)
except Exception as error:
logger.warning(
'Failed to load plugin from "{0}": {1}'
Expand Down