Skip to content

Commit 237c812

Browse files
authored
Fix logging calls to defer formatting messages until needed (#4674)
1 parent 6701d41 commit 237c812

4 files changed

Lines changed: 22 additions & 8 deletions

File tree

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ repos:
77
- id: end-of-file-fixer
88
- id: trailing-whitespace
99
- repo: https://github.com/astral-sh/ruff-pre-commit
10-
rev: v0.12.0
10+
rev: v0.14.8
1111
hooks:
1212
- id: ruff-check
1313
args: [ --fix ]

boto3/resources/model.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ def _load_name_with_category(self, names, name, category, snake_case=True):
366366
name = xform_name(name)
367367

368368
if name in names:
369-
logger.debug(f'Renaming {self.name} {category} {name}')
369+
logger.debug('Renaming %s %s %s', self.name, category, name)
370370
self._renamed[(category, name)] = name + '_' + category
371371
name += '_' + category
372372

boto3/s3/transfer.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -175,13 +175,17 @@ def create_transfer_manager(client, config, osutil=None):
175175
crt_transfer_manager = create_crt_transfer_manager(client, config)
176176
if crt_transfer_manager is not None:
177177
logger.debug(
178-
f"Using CRT client. pid: {getpid()}, thread: {threading.get_ident()}"
178+
"Using CRT client. pid: %s, thread: %s",
179+
getpid(),
180+
threading.get_ident(),
179181
)
180182
return crt_transfer_manager
181183

182184
# If we don't resolve something above, fallback to the default.
183185
logger.debug(
184-
f"Using default client. pid: {getpid()}, thread: {threading.get_ident()}"
186+
"Using default client. pid: %s, thread: %s",
187+
getpid(),
188+
threading.get_ident(),
185189
)
186190
return _create_default_transfer_manager(client, config, osutil)
187191

@@ -214,9 +218,11 @@ def _should_use_crt(config):
214218
return True
215219

216220
logger.debug(
217-
"Opting out of CRT Transfer Manager. Preferred client: "
218-
f"{pref_transfer_client}, CRT available: {HAS_CRT}, "
219-
f"Instance Optimized: {is_optimized_instance}."
221+
"Opting out of CRT Transfer Manager. "
222+
"Preferred client: %s, CRT available: %s, Instance Optimized: %s",
223+
pref_transfer_client,
224+
HAS_CRT,
225+
is_optimized_instance,
220226
)
221227
return False
222228

pyproject.toml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,15 @@ target-version = "py39"
4343
# Enable Pyflakes (`F`) and a subset of the pycodestyle (`E`) codes by default.
4444
# Unlike Flake8, Ruff doesn't enable pycodestyle warnings (`W`) or
4545
# McCabe complexity (`C901`) by default.
46-
select = ["E4", "E7", "E9", "F", "I", "UP"]
46+
select = [
47+
"E4", # pycodestyle
48+
"E7", # pycodestyle
49+
"E9", # pycodestyle
50+
"F", # pyflakes
51+
"G", # flake8-logging-format
52+
"I", # isort
53+
"UP", # pyupgrade
54+
]
4755
ignore = []
4856

4957
# Allow fix for all enabled rules (when `--fix`) is provided.

0 commit comments

Comments
 (0)