Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 3b64f88

Browse files
authored
Merge pull request #3459 from seleniumbase/cft-and-chs-refactoring
CFT and CHS refactoring
2 parents 270d409 + d810233 commit 3b64f88

File tree

8 files changed

+61
-8
lines changed

8 files changed

+61
-8
lines changed

‎.gitignore

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,27 @@ msedgedriver.exe
8282
operadriver.exe
8383
uc_driver.exe
8484

85+
# Chrome for Testing Zip Files
86+
chrome-mac-arm64.zip
87+
chrome-mac-x64.zip
88+
chrome-linux64.zip
89+
chrome-win64.zip
90+
chrome-win32.zip
91+
8592
# Chrome for Testing folders
8693
chrome-mac-arm64
8794
chrome-mac-x64
8895
chrome-linux64
8996
chrome-win64
9097
chrome-win32
9198

99+
# Chrome-Headless-Shell Zip Files
100+
chrome-headless-shell-mac-arm64.zip
101+
chrome-headless-shell-mac-x64.zip
102+
chrome-headless-shell-linux64.zip
103+
chrome-headless-shell-win64.zip
104+
chrome-headless-shell-win32.zip
105+
92106
# Chrome-Headless-Shell folders
93107
chrome-headless-shell-mac-arm64
94108
chrome-headless-shell-mac-x64

‎examples/cdp_mode/raw_chatgpt.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
from seleniumbase import SB
2+
3+
with SB(uc=True, test=True, ad_block=True) as sb:
4+
url = "https://chatgpt.com/"
5+
sb.activate_cdp_mode(url)
6+
query = "Compare Playwright to SeleniumBase in under 178 words"
7+
sb.type("#prompt-textarea", query)
8+
sb.click('button[data-testid="send-button"]')
9+
print('Input for ChatGPT:\n"%s"' % query)
10+
sb.sleep(12)
11+
chat = sb.find_element('[data-message-author-role="assistant"] .markdown')
12+
soup = sb.get_beautiful_soup(chat.get_html()).get_text("\n").strip()
13+
print("Response from ChatGPT:\n%s" % soup.replace("\n:", ":"))

‎mkdocs_build/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
regex>=2024年11月6日
55
pymdown-extensions>=10.14.1
6-
pipdeptree>=2.24.0
6+
pipdeptree>=2.25.0
77
python-dateutil>=2.8.2
88
Markdown==3.7
99
click==8.1.8

‎requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
pip>=24.3.1
1+
pip>=25.0
22
packaging>=24.2
33
setuptools~=70.2;python_version<"3.10"
44
setuptools>=75.8.0;python_version>="3.10"

‎seleniumbase/__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# seleniumbase package
2-
__version__ = "4.34.3"
2+
__version__ = "4.34.4"

‎seleniumbase/console_scripts/sb_install.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import tarfile
4040
import urllib3
4141
import zipfile
42+
from contextlib import suppress
4243
from seleniumbase.fixtures import constants
4344
from seleniumbase.fixtures import shared_utils
4445
from seleniumbase import config as sb_config
@@ -1200,7 +1201,7 @@ def main(override=None, intel_for_uc=None, force_uc=None):
12001201
driver_path = None
12011202
driver_file = None
12021203
base_path = os.sep.join(zip_file_path.split(os.sep)[:-1])
1203-
folder_name = contents[0].split(os.sep)[0]
1204+
folder_name = contents[0].split("/")[0]
12041205
folder_path = os.path.join(base_path, folder_name)
12051206
if IS_MAC or IS_LINUX:
12061207
if (
@@ -1221,12 +1222,14 @@ def main(override=None, intel_for_uc=None, force_uc=None):
12211222
zip_file_path,
12221223
"-DestinationPath",
12231224
downloads_folder,
1225+
"-Force",
12241226
]
12251227
)
12261228
else:
12271229
zip_ref.extractall(downloads_folder)
12281230
zip_ref.close()
1229-
os.remove(zip_file_path)
1231+
with suppress(Exception):
1232+
os.remove(zip_file_path)
12301233
log_d("%sUnzip Complete!%s\n" % (c2, cr))
12311234
pr_base_path = c3 + base_path + cr
12321235
pr_sep = c3 + os.sep + cr
@@ -1240,7 +1243,7 @@ def main(override=None, intel_for_uc=None, force_uc=None):
12401243
driver_path = None
12411244
driver_file = None
12421245
base_path = os.sep.join(zip_file_path.split(os.sep)[:-1])
1243-
folder_name = contents[0].split(os.sep)[0]
1246+
folder_name = contents[0].split("/")[0]
12441247
folder_path = os.path.join(base_path, folder_name)
12451248
if IS_MAC or IS_LINUX:
12461249
if (
@@ -1261,12 +1264,14 @@ def main(override=None, intel_for_uc=None, force_uc=None):
12611264
zip_file_path,
12621265
"-DestinationPath",
12631266
downloads_folder,
1267+
"-Force",
12641268
]
12651269
)
12661270
else:
12671271
zip_ref.extractall(downloads_folder)
12681272
zip_ref.close()
1269-
os.remove(zip_file_path)
1273+
with suppress(Exception):
1274+
os.remove(zip_file_path)
12701275
log_d("%sUnzip Complete!%s\n" % (c2, cr))
12711276
pr_base_path = c3 + base_path + cr
12721277
pr_sep = c3 + os.sep + cr

‎seleniumbase/console_scripts/sb_mkdir.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,27 @@ def main():
247247
data.append("msedgedriver.exe")
248248
data.append("operadriver.exe")
249249
data.append("uc_driver.exe")
250+
data.append("chrome-mac-arm64.zip")
251+
data.append("chrome-mac-x64.zip")
252+
data.append("chrome-linux64.zip")
253+
data.append("chrome-win64.zip")
254+
data.append("chrome-win32.zip")
255+
data.append("chrome-mac-arm64")
256+
data.append("chrome-mac-x64")
257+
data.append("chrome-linux64")
258+
data.append("chrome-win64")
259+
data.append("chrome-win32")
260+
data.append("chrome-headless-shell-mac-arm64.zip")
261+
data.append("chrome-headless-shell-mac-x64.zip")
262+
data.append("chrome-headless-shell-linux64.zip")
263+
data.append("chrome-headless-shell-win64.zip")
264+
data.append("chrome-headless-shell-win32.zip")
265+
data.append("chrome-headless-shell-mac-arm64")
266+
data.append("chrome-headless-shell-mac-x64")
267+
data.append("chrome-headless-shell-linux64")
268+
data.append("chrome-headless-shell-win64")
269+
data.append("chrome-headless-shell-win32")
270+
data.append("libc++.dylib")
250271
data.append("logs")
251272
data.append("latest_logs")
252273
data.append("log_archives")

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
],
148148
python_requires=">=3.8",
149149
install_requires=[
150-
'pip>=24.3.1',
150+
'pip>=25.0',
151151
'packaging>=24.2',
152152
'setuptools~=70.2;python_version<"3.10"', # Newer ones had issues
153153
'setuptools>=75.8.0;python_version>="3.10"',

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /