Mirrors
/
undetected-chromedriver
mirror of https://github.com/ultrafunkamsterdam/undetected-chromedriver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replaced deprecated "diskutils" with "packaging" to fix compatibility with Python 3.12

This commit is contained in:
Tim Behrends 2024-02-26 17:38:23 +01:00
parent 0aa5fbe252
commit 76056f7e40
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
setup.py
View File

@ -44,6 +44,7 @@ setup(
"selenium>=4.9.0", "selenium>=4.9.0",
"requests", "requests",
"websockets", "websockets",
"packaging",
], ],
package_data={"undetected_chromedriver": [os.path.join("example", "example.py")]}, package_data={"undetected_chromedriver": [os.path.join("example", "example.py")]},
url="https://github.com/ultrafunkamsterdam/undetected-chromedriver", url="https://github.com/ultrafunkamsterdam/undetected-chromedriver",

18
undetected_chromedriver/patcher.py
View File

@ -1,7 +1,7 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# this module is part of undetected_chromedriver # this module is part of undetected_chromedriver
from distutils.version import LooseVersion from packaging import version
import io import io
import json import json
import logging import logging
@ -173,7 +173,7 @@ class Patcher(object):
pass pass
release = self.fetch_release_number() release = self.fetch_release_number()
self.version_main = release.version[0] self.version_main = release.major
self.version_full = release self.version_full = release
self.unzip_package(self.fetch_package()) self.unzip_package(self.fetch_package())
return self.patch() return self.patch()
@ -233,14 +233,14 @@ class Patcher(object):
""" """
Gets the latest major version available, or the latest major version of self.target_version if set explicitly. Gets the latest major version available, or the latest major version of self.target_version if set explicitly.
:return: version string :return: version string
:rtype: LooseVersion :rtype: packaging.version.Version
""" """
# Endpoint for old versions of Chromedriver (114 and below) # Endpoint for old versions of Chromedriver (114 and below)
if self.is_old_chromedriver: if self.is_old_chromedriver:
path = f"/latest_release_{self.version_main}" path = f"/latest_release_{self.version_main}"
path = path.upper() path = path.upper()
logger.debug("getting release number from %s" % path) logger.debug("getting release number from %s" % path)
return LooseVersion(urlopen(self.url_repo + path).read().decode()) return version.parse(urlopen(self.url_repo + path).read().decode())
# Endpoint for new versions of Chromedriver (115+) # Endpoint for new versions of Chromedriver (115+)
if not self.version_main: if not self.version_main:
@ -251,7 +251,7 @@ class Patcher(object):
response = conn.read().decode() response = conn.read().decode()
last_versions = json.loads(response) last_versions = json.loads(response)
return LooseVersion(last_versions["channels"]["Stable"]["version"]) return version.parse(last_versions["channels"]["Stable"]["version"])
# Fetch the latest minor version of the major version provided # Fetch the latest minor version of the major version provided
path = "/latest-versions-per-milestone-with-downloads.json" path = "/latest-versions-per-milestone-with-downloads.json"
@ -260,14 +260,14 @@ class Patcher(object):
response = conn.read().decode() response = conn.read().decode()
major_versions = json.loads(response) major_versions = json.loads(response)
return LooseVersion(major_versions["milestones"][str(self.version_main)]["version"]) return version.parse(major_versions["milestones"][str(self.version_main)]["version"])
def parse_exe_version(self): def parse_exe_version(self):
with io.open(self.executable_path, "rb") as f: with io.open(self.executable_path, "rb") as f:
for line in iter(lambda: f.readline(), b""): for line in iter(lambda: f.readline(), b""):
match = re.search(rb"platform_handle\x00content\x00([0-9.]*)", line) match = re.search(rb"platform_handle\x00content\x00([0-9.]*)", line)
if match: if match:
return LooseVersion(match[1].decode()) return version.parse(match[1].decode())
def fetch_package(self): def fetch_package(self):
""" """
@ -277,11 +277,11 @@ class Patcher(object):
""" """
zip_name = f"chromedriver_{self.platform_name}.zip" zip_name = f"chromedriver_{self.platform_name}.zip"
if self.is_old_chromedriver: if self.is_old_chromedriver:
download_url = "%s/%s/%s" % (self.url_repo, self.version_full.vstring, zip_name) download_url = "%s/%s/%s" % (self.url_repo, self.version_full, zip_name)
else: else:
zip_name = zip_name.replace("_", "-", 1) zip_name = zip_name.replace("_", "-", 1)
download_url = "https://storage.googleapis.com/chrome-for-testing-public/%s/%s/%s" download_url = "https://storage.googleapis.com/chrome-for-testing-public/%s/%s/%s"
download_url %= (self.version_full.vstring, self.platform_name, zip_name) download_url %= (self.version_full, self.platform_name, zip_name)
logger.debug("downloading from %s" % download_url) logger.debug("downloading from %s" % download_url)
return urlretrieve(download_url)[0] return urlretrieve(download_url)[0]