Skip to content

Commit 924e620

Browse files
authored
Merge pull request #209 from seleniumbase/raw-strings-for-regex
Use raw strings for regular expressions
2 parents e37766f + efde13b commit 924e620

File tree

4 files changed

+84
-78
lines changed

4 files changed

+84
-78
lines changed

seleniumbase/core/browser_launcher.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,8 @@ def validate_proxy_string(proxy_string):
128128
if not proxy_string:
129129
return None
130130
valid = False
131-
val_ip = re.match('^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d+$', proxy_string)
131+
val_ip = re.match(
132+
r'^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}:\d+$', proxy_string)
132133
if not val_ip:
133134
if proxy_string.startswith('http://'):
134135
proxy_string = proxy_string.split('http://')[1]
@@ -138,7 +139,7 @@ def validate_proxy_string(proxy_string):
138139
proxy_string = proxy_string.split('://')[1]
139140
chunks = proxy_string.split(':')
140141
if len(chunks) == 2:
141-
if re.match('^\d+$', chunks[1]):
142+
if re.match(r'^\d+$', chunks[1]):
142143
if page_utils.is_valid_url('http://' + proxy_string):
143144
valid = True
144145
else:

seleniumbase/fixtures/base_case.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,7 +1068,7 @@ def __add_shepherd_tour_step(self, message, selector=None, name=None,
10681068
shepherd_theme = "shepherd-theme-square-dark"
10691069
else:
10701070
shepherd_base_theme = re.search(
1071-
"[\S\s]+classes: '([\S\s]+)',[\S\s]+",
1071+
r"[\S\s]+classes: '([\S\s]+)',[\S\s]+",
10721072
self._tour_steps[name][0]).group(1)
10731073
shepherd_theme = shepherd_base_theme
10741074

@@ -1169,7 +1169,7 @@ def __play_shepherd_tour(self, name=None, interval=0):
11691169
if len(self._tour_steps[name]) > 1:
11701170
try:
11711171
selector = re.search(
1172-
"[\S\s]+{element: '([\S\s]+)', on: [\S\s]+",
1172+
r"[\S\s]+{element: '([\S\s]+)', on: [\S\s]+",
11731173
self._tour_steps[name][1]).group(1)
11741174
selector = selector.replace('\\', '')
11751175
self.wait_for_element_present(
@@ -1290,7 +1290,7 @@ def __play_bootstrap_tour(self, name=None, interval=0):
12901290
try:
12911291
if "element: " in self._tour_steps[name][1]:
12921292
selector = re.search(
1293-
"[\S\s]+element: '([\S\s]+)',[\S\s]+title: '",
1293+
r"[\S\s]+element: '([\S\s]+)',[\S\s]+title: '",
12941294
self._tour_steps[name][1]).group(1)
12951295
selector = selector.replace('\\', '')
12961296
self.wait_for_element_present(

0 commit comments

Comments
 (0)