From 3bde77cd913f03b88eec7ad7777f1f23c1351495 Mon Sep 17 00:00:00 2001
From: Miguel Jacq <mig@mig5.net>
Date: Mon, 3 Feb 2025 17:36:20 +1100
Subject: [PATCH] Replace distutils.version with packaging.version

---
 cli/onionshare_cli/onion.py          | 6 ++++--
 desktop/onionshare/update_checker.py | 5 +++--
 desktop/scripts/build-windows.py     | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/cli/onionshare_cli/onion.py b/cli/onionshare_cli/onion.py
index 6e1dad74..85576c2b 100644
--- a/cli/onionshare_cli/onion.py
+++ b/cli/onionshare_cli/onion.py
@@ -27,13 +27,14 @@ import base64
 import nacl.public
 import os
 import psutil
+import re
 import shlex
 import subprocess
 import tempfile
 import time
 import traceback
 
-from distutils.version import LooseVersion as Version
+from packaging.version import Version
 
 
 class TorErrorAutomatic(Exception):
@@ -658,7 +659,8 @@ class Onion(object):
         # Does this version of Tor support next-gen ('v3') onions?
         # Note, this is the version of Tor where this bug was fixed:
         # https://trac.torproject.org/projects/tor/ticket/28619
-        self.supports_v3_onions = self.tor_version >= Version("0.3.5.7")
+        cleaned_tor_version = re.sub(r"\s*\(.*\)", "", self.tor_version)
+        self.supports_v3_onions = Version(cleaned_tor_version) >= Version("0.3.5.7")
 
         # Now that we are connected to Tor, if we are using built-in bridges,
         # update them with the latest copy available from the Tor API
diff --git a/desktop/onionshare/update_checker.py b/desktop/onionshare/update_checker.py
index 6d0662a1..e40a8c77 100644
--- a/desktop/onionshare/update_checker.py
+++ b/desktop/onionshare/update_checker.py
@@ -22,7 +22,7 @@ from PySide6 import QtCore
 import datetime
 import re
 import socks
-from distutils.version import LooseVersion as Version
+from packaging.version import Version
 
 from onionshare_cli.settings import Settings
 
@@ -106,7 +106,8 @@ class UpdateChecker(QtCore.QObject):
                 if force:
                     path += "?force=1"
 
-                if Version(self.onion.tor_version) >= Version("0.3.2.9"):
+                cleaned_tor_version = re.sub(r"\s*\(.*\)", "", self.onion.tor_version)
+                if Version(cleaned_tor_version) >= Version("0.3.2.9"):
                     onion_domain = (
                         "lldan5gahapx5k7iafb3s4ikijc4ni7gx5iywdflkba5y2ezyg6sjgyd.onion"
                     )
diff --git a/desktop/scripts/build-windows.py b/desktop/scripts/build-windows.py
index ca5835f9..9b699918 100644
--- a/desktop/scripts/build-windows.py
+++ b/desktop/scripts/build-windows.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-from distutils.command.build import build
+from setuptools.command.build import build
 import sys
 import os
 import inspect