Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-03-03 11:49:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1954 from onionshare/remove-distutils-again

Browse Source 
Replace distutils.version with packaging.version
This commit is contained in:
Saptak Sengupta 2025-02-05 13:12:28 +05:30 committed by GitHub
commit 9c1421bc84
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/onionshare_cli/onion.py
View File

@ -27,13 +27,14 @@ import base64
import nacl.public import nacl.public
import os import os
import psutil import psutil
import re
import shlex import shlex
import subprocess import subprocess
import tempfile import tempfile
import time import time
import traceback import traceback
from distutils.version import LooseVersion as Version from packaging.version import Version
class TorErrorAutomatic(Exception): class TorErrorAutomatic(Exception):
@ -658,7 +659,8 @@ class Onion(object):
# Does this version of Tor support next-gen ('v3') onions? # Does this version of Tor support next-gen ('v3') onions?
# Note, this is the version of Tor where this bug was fixed: # Note, this is the version of Tor where this bug was fixed:
# https://trac.torproject.org/projects/tor/ticket/28619 # 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, # 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 # update them with the latest copy available from the Tor API

5
desktop/onionshare/update_checker.py
View File

@ -22,7 +22,7 @@ from PySide6 import QtCore
import datetime import datetime
import re import re
import socks import socks
from distutils.version import LooseVersion as Version from packaging.version import Version
from onionshare_cli.settings import Settings from onionshare_cli.settings import Settings
@ -106,7 +106,8 @@ class UpdateChecker(QtCore.QObject):
if force: if force:
path += "?force=1" 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 = ( onion_domain = (
"lldan5gahapx5k7iafb3s4ikijc4ni7gx5iywdflkba5y2ezyg6sjgyd.onion" "lldan5gahapx5k7iafb3s4ikijc4ni7gx5iywdflkba5y2ezyg6sjgyd.onion"
) )

2
desktop/scripts/build-windows.py
View File

@ -1,5 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
from distutils.command.build import build from setuptools.command.build import build
import sys import sys
import os import os
import inspect import inspect