Skip to content

Commit 07703ac

Browse files
mdmintzmdmintz
committed
So some refactoring
1 parent ab3b149 commit 07703ac

File tree

4 files changed

+16
-35
lines changed

4 files changed

+16
-35
lines changed

‎seleniumbase/console_scripts/run.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ def show_basic_usage():
105105
sc += " download server (Get Selenium Grid JAR file)\n"
106106
sc += " grid-hub [start|stop] [OPTIONS]\n"
107107
sc += " grid-node [start|stop] --hub=[HOST/IP]\n"
108-
sc += ' * (EXAMPLE: "sbase get chromedriver latest") *\n'
108+
sc += ' * (EXAMPLE: "sbase get chromedriver") *\n'
109109
sc += ""
110110
if "linux" not in sys.platform:
111111
c1 = colorama.Fore.BLUE + colorama.Back.LIGHTCYAN_EX
@@ -133,9 +133,7 @@ def show_install_usage():
133133
print(" Options:")
134134
print(" VERSION Specify the version to download.")
135135
print(" Tries to detect the needed version.")
136-
print(' Use "latest" for the latest version.')
137-
print(' Use "latest-1" for one less than that.')
138-
print(" For chromedriver or edgedriver,")
136+
print(" If using chromedriver or edgedriver,")
139137
print(" you can use the major version integer.")
140138
print()
141139
print(" -p OR --path Also copy the driver to /usr/local/bin")
@@ -145,10 +143,7 @@ def show_install_usage():
145143
print(" sbase get edgedriver")
146144
print(" sbase get chromedriver 114")
147145
print(" sbase get chromedriver 114.0.5735.90")
148-
print(" sbase get chromedriver latest")
149-
print(" sbase get chromedriver latest-1")
150146
print(" sbase get chromedriver -p")
151-
print(" sbase get chromedriver latest -p")
152147
print(" Output:")
153148
print(" Downloads the webdriver to seleniumbase/drivers/")
154149
print(" (chromedriver is required for Chrome automation)")

‎seleniumbase/console_scripts/sb_install.py

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,16 @@
77
Options:
88
VERSION Specify the version.
99
Tries to detect the needed version.
10-
Use "latest" for the latest version.
11-
Use "latest-1" for one less than that.
10+
If using chromedriver or edgedriver,
11+
you can use the major version integer.
1212
-p OR --path Also copy the driver to /usr/local/bin
1313
Examples:
1414
sbase get chromedriver
1515
sbase get geckodriver
1616
sbase get edgedriver
1717
sbase get chromedriver 114
1818
sbase get chromedriver 114.0.5735.90
19-
sbase get chromedriver latest
20-
sbase get chromedriver latest-1 # (Latest minus one)
2119
sbase get chromedriver -p
22-
sbase get chromedriver latest -p
2320
Output:
2421
Downloads the webdriver to seleniumbase/drivers/
2522
(chromedriver is required for Chrome automation)
@@ -42,9 +39,6 @@
4239
from seleniumbase import drivers # webdriver storage folder for SeleniumBase
4340

4441
urllib3.disable_warnings()
45-
selenium4_or_newer = False
46-
if sys.version_info >= (3, 7):
47-
selenium4_or_newer = True
4842
ARCH = platform.architecture()[0]
4943
IS_ARM_MAC = shared_utils.is_arm_mac()
5044
IS_MAC = shared_utils.is_mac()
@@ -70,9 +64,7 @@ def invalid_run_command():
7064
exp += " Options:\n"
7165
exp += " VERSION Specify the version.\n"
7266
exp += " Tries to detect the needed version.\n"
73-
exp += ' Use "latest" for the latest version.\n'
74-
exp += ' Use "latest-1" for one less than that.\n'
75-
exp += " For chromedriver or edgedriver,\n"
67+
exp += " If using chromedriver or edgedriver,\n"
7668
exp += " you can use the major version integer.\n"
7769
exp += " -p OR --path Also copy the driver to /usr/local/bin\n"
7870
exp += " Examples:\n"
@@ -81,10 +73,7 @@ def invalid_run_command():
8173
exp += " sbase get edgedriver\n"
8274
exp += " sbase get chromedriver 114\n"
8375
exp += " sbase get chromedriver 114.0.5735.90\n"
84-
exp += " sbase get chromedriver latest\n"
85-
exp += " sbase get chromedriver latest-1\n"
8676
exp += " sbase get chromedriver -p\n"
87-
exp += " sbase get chromedriver latest -p\n"
8877
exp += " Output:\n"
8978
exp += " Downloads the webdriver to seleniumbase/drivers/\n"
9079
exp += " (chromedriver is required for Chrome automation)\n"
@@ -247,8 +236,7 @@ def main(override=None, intel_for_uc=None):
247236
use_version = DEFAULT_CHROMEDRIVER_VERSION
248237

249238
if (
250-
selenium4_or_newer
251-
and not override
239+
not override
252240
and (
253241
num_args == 3
254242
or (num_args == 4 and "-p" in sys.argv[3].lower())
@@ -410,7 +398,7 @@ def main(override=None, intel_for_uc=None):
410398
else:
411399
raise Exception("Could not find chromedriver to download!\n")
412400
if not get_latest:
413-
pass # Previously recommended: "sbase get chromedriver latest"
401+
pass
414402
elif name == "geckodriver" or name == "firefoxdriver":
415403
use_version = DEFAULT_GECKODRIVER_VERSION
416404
found_geckodriver = False
@@ -473,8 +461,7 @@ def main(override=None, intel_for_uc=None):
473461
)
474462

475463
if (
476-
selenium4_or_newer
477-
and not override
464+
not override
478465
and (
479466
num_args == 3
480467
or (num_args == 4 and "-p" in sys.argv[3].lower())

‎seleniumbase/core/browser_launcher.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -291,12 +291,12 @@ def get_valid_binary_names_for_browser(browser):
291291
def _repair_chromedriver(chrome_options, headless_options, mcv=None):
292292
if mcv:
293293
subprocess.check_call(
294-
"sbase install chromedriver %s" % mcv, shell=True
294+
"sbase get chromedriver %s" % mcv, shell=True
295295
)
296296
return
297297
driver = None
298298
subprocess.check_call(
299-
"sbase install chromedriver 72.0.3626.69", shell=True
299+
"sbase get chromedriver 72.0.3626.69", shell=True
300300
)
301301
try:
302302
if selenium4_or_newer:
@@ -312,7 +312,7 @@ def _repair_chromedriver(chrome_options, headless_options, mcv=None):
312312
)
313313
except Exception:
314314
subprocess.check_call(
315-
"sbase install chromedriver latest-1", shell=True
315+
"sbase get chromedriver latest-1", shell=True
316316
)
317317
return
318318
chrome_version = None
@@ -331,7 +331,7 @@ def _repair_chromedriver(chrome_options, headless_options, mcv=None):
331331
and int(major_chrome_ver) >= 73
332332
):
333333
subprocess.check_call(
334-
"sbase install chromedriver %s" % major_chrome_ver, shell=True
334+
"sbase get chromedriver %s" % major_chrome_ver, shell=True
335335
)
336336
return
337337

@@ -342,7 +342,7 @@ def _repair_edgedriver(edge_version):
342342
"\nAttempting to install a matching version of msedgedriver:"
343343
)
344344
subprocess.check_call(
345-
"sbase install edgedriver %s" % edge_version, shell=True
345+
"sbase get edgedriver %s" % edge_version, shell=True
346346
)
347347
return
348348

‎seleniumbase/undetected/__init__.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
)
2929
logger = logging.getLogger("uc")
3030
logger.setLevel(logging.getLogger().getEffectiveLevel())
31-
sys_plat = sys.platform
3231

3332

3433
class Chrome(selenium.webdriver.chrome.webdriver.WebDriver):
@@ -266,7 +265,7 @@ def __init__(
266265
except Exception:
267266
pass
268267
creationflags = 0
269-
if "win32" in sys_plat or "win64" in sys_plat or "x64" in sys_plat:
268+
if "win32" in sys.platform:
270269
creationflags = subprocess.CREATE_NO_WINDOW
271270
self.options = options
272271
if not use_subprocess:
@@ -477,7 +476,7 @@ def quit(self):
477476

478477
def __del__(self):
479478
try:
480-
if "win32" in sys_plat:
479+
if "win32" in sys.platform:
481480
self.stop_client()
482481
self.command_executor.close()
483482
else:
@@ -516,7 +515,7 @@ def find_chrome_executable():
516515
"chromium-browser",
517516
):
518517
candidates.add(os.sep.join((item, subitem)))
519-
if "darwin" in sys_plat:
518+
if "darwin" in sys.platform:
520519
gc = "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
521520
candidates.update(
522521
[

0 commit comments

Comments
 (0)