Skip to content

Commit 76b9852

Browse files
committed
refactor: refactor logger messages to use consistent single quotes
1 parent baef732 commit 76b9852

File tree

15 files changed

+402
-275
lines changed

15 files changed

+402
-275
lines changed

pydoll/browser/chromium/base.py

Lines changed: 77 additions & 77 deletions
Large diffs are not rendered by default.

pydoll/browser/chromium/chrome.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def _get_default_binary_location():
4242
ValueError: If executable not found at default location.
4343
"""
4444
os_name = platform.system()
45-
logger.debug(f"Resolving default Chrome binary for OS: {os_name}")
45+
logger.debug(f'Resolving default Chrome binary for OS: {os_name}')
4646

4747
browser_paths = {
4848
'Windows': [
@@ -61,9 +61,9 @@ def _get_default_binary_location():
6161
browser_path = browser_paths.get(os_name)
6262

6363
if not browser_path:
64-
logger.error(f"Unsupported OS: {os_name}")
64+
logger.error(f'Unsupported OS: {os_name}')
6565
raise UnsupportedOS(f'Unsupported OS: {os_name}')
6666

6767
path = validate_browser_paths(browser_path)
68-
logger.debug(f"Using Chrome binary: {path}")
68+
logger.debug(f'Using Chrome binary: {path}')
6969
return path

pydoll/browser/chromium/edge.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def _get_default_binary_location():
4242
ValueError: If executable not found at default location.
4343
"""
4444
os_name = platform.system()
45-
logger.debug(f"Resolving default Edge binary for OS: {os_name}")
45+
logger.debug(f'Resolving default Edge binary for OS: {os_name}')
4646

4747
browser_paths = {
4848
'Windows': [
@@ -66,9 +66,9 @@ def _get_default_binary_location():
6666
browser_path = browser_paths.get(os_name)
6767

6868
if not browser_path:
69-
logger.error(f"Unsupported OS: {os_name}")
69+
logger.error(f'Unsupported OS: {os_name}')
7070
raise UnsupportedOS()
7171

7272
path = validate_browser_paths(browser_path)
73-
logger.debug(f"Using Edge binary: {path}")
73+
logger.debug(f'Using Edge binary: {path}')
7474
return path

pydoll/browser/managers/browser_options_manager.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ class ChromiumOptionsManager(BrowserOptionsManager):
1919
def __init__(self, options: Optional[Options] = None):
2020
self.options = options
2121
logger.debug(
22-
f"ChromiumOptionsManager initialized with options="
23-
f"{type(options).__name__ if options is not None else 'None'}"
22+
f'ChromiumOptionsManager initialized with options='
23+
f'{type(options).__name__ if options is not None else "None"}'
2424
)
2525

2626
def initialize_options(
@@ -40,18 +40,18 @@ def initialize_options(
4040
"""
4141
if self.options is None:
4242
self.options = ChromiumOptions()
43-
logger.debug("No options provided; created default ChromiumOptions")
43+
logger.debug('No options provided; created default ChromiumOptions')
4444

4545
if not isinstance(self.options, ChromiumOptions):
46-
logger.error(f"Invalid options type: {type(self.options)}; expected ChromiumOptions")
46+
logger.error(f'Invalid options type: {type(self.options)}; expected ChromiumOptions')
4747
raise InvalidOptionsObject(f'Expected ChromiumOptions, got {type(self.options)}')
4848

4949
self.add_default_arguments()
50-
logger.debug("Options initialized and default arguments applied")
50+
logger.debug('Options initialized and default arguments applied')
5151
return self.options
5252

5353
def add_default_arguments(self):
5454
"""Add default arguments required for CDP integration."""
55-
logger.debug("Adding default arguments for Chromium-based browsers")
55+
logger.debug('Adding default arguments for Chromium-based browsers')
5656
self.options.add_argument('--no-first-run')
5757
self.options.add_argument('--no-default-browser-check')

pydoll/browser/managers/browser_process_manager.py

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ def __init__(
2828
self._process_creator = process_creator or self._default_process_creator
2929
self._process: Optional[subprocess.Popen] = None
3030
logger.debug(
31-
f"BrowserProcessManager initialized; "
32-
f"custom process_creator={bool(process_creator)}"
31+
f'BrowserProcessManager initialized; custom process_creator={bool(process_creator)}'
3332
)
3433

3534
def start_browser_process(
@@ -52,24 +51,23 @@ def start_browser_process(
5251
Note:
5352
Automatically adds --remote-debugging-port argument.
5453
"""
55-
logger.info(f"Starting browser process: {binary_location} on port {port}")
54+
logger.info(f'Starting browser process: {binary_location} on port {port}')
5655
command = [
5756
binary_location,
5857
f'--remote-debugging-port={port}',
5958
*arguments,
6059
]
61-
logger.debug(f"Command: {command}")
60+
logger.debug(f'Command: {command}')
6261
self._process = self._process_creator(command)
6362
logger.debug(
64-
f"Browser process started: pid="
65-
f"{self._process.pid if self._process else 'unknown'}"
63+
f'Browser process started: pid={self._process.pid if self._process else "unknown"}'
6664
)
6765
return self._process
6866

6967
@staticmethod
7068
def _default_process_creator(command: list[str]) -> subprocess.Popen:
7169
"""Create browser process with output capture to prevent console clutter."""
72-
logger.debug(f"Creating process: {command}")
70+
logger.debug(f'Creating process: {command}')
7371
return subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
7472

7573
def stop_process(self):
@@ -80,12 +78,12 @@ def stop_process(self):
8078
Safe to call even if no process is running.
8179
"""
8280
if self._process:
83-
logger.info(f"Stopping browser process pid={self._process.pid}")
81+
logger.info(f'Stopping browser process pid={self._process.pid}')
8482
self._process.terminate()
8583
try:
8684
self._process.wait(timeout=15)
87-
logger.debug("Process terminated gracefully")
85+
logger.debug('Process terminated gracefully')
8886
except subprocess.TimeoutExpired:
89-
logger.warning("Process did not terminate in 15s; sending SIGKILL")
87+
logger.warning('Process did not terminate in 15s; sending SIGKILL')
9088
self._process.kill()
91-
logger.debug("Process killed")
89+
logger.debug('Process killed')

pydoll/browser/managers/proxy_manager.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def __init__(self, options: Options):
2323
Will be modified if credentials are found.
2424
"""
2525
self.options = options
26-
logger.debug("ProxyManager initialized with options")
26+
logger.debug('ProxyManager initialized with options')
2727

2828
def get_proxy_credentials(self) -> tuple[bool, tuple[Optional[str], Optional[str]]]:
2929
"""
@@ -49,10 +49,10 @@ def get_proxy_credentials(self) -> tuple[bool, tuple[Optional[str], Optional[str
4949
private_proxy = True
5050
credentials = (username, password)
5151
logger.debug(
52-
f"Proxy credentials extracted (user_set={bool(username)}); argument sanitized"
52+
f'Proxy credentials extracted (user_set={bool(username)}); argument sanitized'
5353
)
5454
else:
55-
logger.debug("Proxy configured without embedded credentials")
55+
logger.debug('Proxy configured without embedded credentials')
5656

5757
return private_proxy, credentials
5858

@@ -66,7 +66,7 @@ def _find_proxy_argument(self) -> Optional[tuple[int, str]]:
6666
for index, arg in enumerate(self.options.arguments):
6767
if arg.startswith('--proxy-server='):
6868
value = arg.split('=', 1)[1]
69-
logger.debug(f"Found proxy argument at index {index}: {value}")
69+
logger.debug(f'Found proxy argument at index {index}: {value}')
7070
return index, value
7171
return None
7272

@@ -94,12 +94,12 @@ def _parse_proxy(proxy_value: str) -> tuple[bool, Optional[str], Optional[str],
9494
creds_part, server_part = proxy_value.split('@', 1)
9595
username, password = creds_part.split(':', 1)
9696

97-
clean_proxy = f"{scheme}://{server_part}" if has_scheme else server_part
97+
clean_proxy = f'{scheme}://{server_part}' if has_scheme else server_part
9898
return True, username, password, clean_proxy
9999
except ValueError:
100100
return False, None, None, proxy_value
101101

102102
def _update_proxy_argument(self, index: int, clean_proxy: str) -> None:
103103
"""Replace proxy argument with credential-free version."""
104104
self.options.arguments[index] = f'--proxy-server={clean_proxy}'
105-
logger.debug(f"Proxy argument updated at index {index}: {clean_proxy}")
105+
logger.debug(f'Proxy argument updated at index {index}: {clean_proxy}')

pydoll/browser/managers/temp_dir_manager.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def __init__(self, temp_dir_factory: Callable[[], TemporaryDirectory] = Temporar
2626
"""
2727
self._temp_dir_factory = temp_dir_factory
2828
self._temp_dirs: list[TemporaryDirectory] = []
29-
logger.debug("TempDirectoryManager initialized")
29+
logger.debug('TempDirectoryManager initialized')
3030

3131
def create_temp_dir(self) -> TemporaryDirectory:
3232
"""
@@ -37,7 +37,7 @@ def create_temp_dir(self) -> TemporaryDirectory:
3737
"""
3838
temp_dir = self._temp_dir_factory()
3939
self._temp_dirs.append(temp_dir)
40-
logger.debug(f"Created temp directory: {temp_dir.name}")
40+
logger.debug(f'Created temp directory: {temp_dir.name}')
4141
return temp_dir
4242

4343
@staticmethod
@@ -62,7 +62,7 @@ def retry_process_file(func: Callable[[str], None], path: str, retry_times: int
6262
except PermissionError:
6363
time.sleep(0.1)
6464
logger.debug(
65-
f"Retrying file operation due to PermissionError (attempt {retry_time})"
65+
f'Retrying file operation due to PermissionError (attempt {retry_time})'
6666
)
6767
else:
6868
raise PermissionError()
@@ -88,7 +88,7 @@ def handle_cleanup_error(self, func: Callable[[str], None], path: str, exc_info:
8888
self.retry_process_file(func, path)
8989
return
9090
except PermissionError:
91-
logger.warning(f"Failed retrying cleanup for locked file: {path}")
91+
logger.warning(f'Failed retrying cleanup for locked file: {path}')
9292
raise exc_value
9393
elif exc_type is OSError:
9494
return
@@ -102,5 +102,5 @@ def cleanup(self):
102102
Continues cleanup even if some files resist deletion.
103103
"""
104104
for temp_dir in self._temp_dirs:
105-
logger.info(f"Cleaning up temp directory: {temp_dir.name}")
105+
logger.info(f'Cleaning up temp directory: {temp_dir.name}')
106106
shutil.rmtree(temp_dir.name, onerror=self.handle_cleanup_error)

0 commit comments

Comments
 (0)