From 5ddb5228750126ae867b042ef17d90b4d64a3945 Mon Sep 17 00:00:00 2001 From: erhe Date: Fri, 22 Mar 2024 14:12:00 +0100 Subject: [PATCH 1/2] remove distuilts.version import --- source/ftrack_api/session.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/source/ftrack_api/session.py b/source/ftrack_api/session.py index d8a4f69e..cf4e401e 100644 --- a/source/ftrack_api/session.py +++ b/source/ftrack_api/session.py @@ -18,7 +18,6 @@ import getpass import functools import itertools -import distutils.version import hashlib import tempfile import threading @@ -438,10 +437,14 @@ def check_server_compatibility(self): # Perform basic version check. if server_version != "dev": - min_server_version = "3.3.11" - if distutils.version.LooseVersion( - min_server_version - ) > distutils.version.LooseVersion(server_version): + import re + + match = re.match(r"(\d+)\.(\d+)\.(\d+)", server_version) + if not match: + return + + min_server_version = (3, 3, 11) + if tuple(map(int, match.groups())) < min_server_version: raise ftrack_api.exception.ServerCompatibilityError( "Server version {0} incompatible with this version of the " "API which requires a server version >= {1}".format( From 498e61a0913c08646e04e105fe0f860e5f0ba5eb Mon Sep 17 00:00:00 2001 From: erhe Date: Fri, 22 Mar 2024 14:13:13 +0100 Subject: [PATCH 2/2] bad error. --- source/ftrack_api/session.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/ftrack_api/session.py b/source/ftrack_api/session.py index cf4e401e..e0d3fa10 100644 --- a/source/ftrack_api/session.py +++ b/source/ftrack_api/session.py @@ -444,7 +444,8 @@ def check_server_compatibility(self): return min_server_version = (3, 3, 11) - if tuple(map(int, match.groups())) < min_server_version: + server_version = tuple(map(int, match.groups())) + if server_version < min_server_version: raise ftrack_api.exception.ServerCompatibilityError( "Server version {0} incompatible with this version of the " "API which requires a server version >= {1}".format(