Skip to content

Commit ab1dcce

Browse files
committed
Use own logger instead of root logger
1 parent 6d41a20 commit ab1dcce

File tree

2 files changed

+26
-22
lines changed

2 files changed

+26
-22
lines changed

bpo_redirecter.py

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,15 @@
3333
# :issue:`45440`
3434
BPO_ROLE_REGEX = re.compile(r":issue:`(\d+)`")
3535

36+
logger = logging.getLogger(__name__)
37+
3638

3739
@cache
3840
def redirect(client: httpx.Client, bpo_number: int) -> str:
3941
redirect_link = f"https://bugs.python.org/issue?@action=redirect&bpo={bpo_number}"
40-
logging.info("Redirect link:\t%s", redirect_link)
42+
logger.info("Redirect link:\t%s", redirect_link)
4143
r = client.get(redirect_link, follow_redirects=True)
42-
logging.info("GitHub link:\t%s", r.url)
44+
logger.info("GitHub link:\t%s", r.url)
4345
return str(r.url)
4446

4547

@@ -74,15 +76,15 @@ def do_lines(old_lines: list[str], filename: str) -> list[str]:
7476
ms = BPO_URL_REGEX.findall(line.strip())
7577
new_line = line
7678
for m in ms:
77-
logging.info("Old line:\t%s", line.rstrip())
79+
logger.info("Old line:\t%s", line.rstrip())
7880
# bpo_link = f"https://bugs.python.org/issue{m}"
79-
# logging.info("BPO link:\t%s", bpo_link)
81+
# logger.info("BPO link:\t%s", bpo_link)
8082
bpo_number = int(m)
81-
logging.info("BPO number:\t%d", bpo_number)
83+
logger.info("BPO number:\t%d", bpo_number)
8284

8385
gh_link = redirect(client, bpo_number)
8486
new_line = BPO_URL_REGEX.sub(gh_link, new_line, count=1)
85-
logging.info("New line:\t%s", new_line.rstrip())
87+
logger.info("New line:\t%s", new_line.rstrip())
8688

8789
if line != new_line:
8890
changes += 1
@@ -92,18 +94,18 @@ def do_lines(old_lines: list[str], filename: str) -> list[str]:
9294
ms = BPO_ROLE_REGEX.findall(line.strip())
9395
new_line = line
9496
for m in ms:
95-
logging.info("Old line:\t%s", line.rstrip())
97+
logger.info("Old line:\t%s", line.rstrip())
9698
# bpo_role = f":issue:`{m}`"
97-
# logging.info("BPO link:\t%s", bpo_role)
99+
# logger.info("BPO link:\t%s", bpo_role)
98100
bpo_number = int(m)
99-
logging.info("BPO number:\t%d", bpo_number)
101+
logger.info("BPO number:\t%d", bpo_number)
100102

101103
gh_link = redirect(client, bpo_number)
102104
gh_number = gh_link.split("/")[-1]
103105
new_role = f":gh:`{gh_number}`"
104-
logging.info("New role:\t%s", new_role)
106+
logger.info("New role:\t%s", new_role)
105107
new_line = BPO_ROLE_REGEX.sub(new_role, new_line, count=1)
106-
logging.info("New line:\t%s", new_line.rstrip())
108+
logger.info("New line:\t%s", new_line.rstrip())
107109

108110
if line != new_line:
109111
changes += 1
@@ -135,7 +137,7 @@ def do_file_or_path(file_or_path: str, dry_run: bool = False) -> None:
135137
else:
136138
for p in sorted(Path(file_or_path).rglob("*")):
137139
if p.suffix in (".py", ".rst", ".txt") and p.is_file():
138-
logging.info(p)
140+
logger.info(p)
139141
do_file(str(p), dry_run)
140142
# print()
141143

@@ -168,7 +170,7 @@ def main() -> None:
168170

169171
do_file_or_path(args.input, args.dry_run)
170172

171-
logging.info(redirect.cache_info())
173+
logger.info(redirect.cache_info())
172174

173175

174176
if __name__ == "__main__":

upgrade_actions.py

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,13 @@
2525

2626
USES_REGEX = re.compile(r"(- )?uses: \"?([a-z-]+/[a-z-]+)@([a-z0-9.]+)\"?")
2727

28+
logger = logging.getLogger(__name__)
29+
2830

2931
@cache
3032
def get_repo_tags(repo: str) -> Iterable[str]:
3133
url = f"https://github.com/{repo}/tags.atom"
32-
logging.info(url)
34+
logger.info(url)
3335
feed = feedparser.parse(url)
3436
return [entry.link.split("/")[-1] for entry in feed.entries]
3537

@@ -39,11 +41,11 @@ def update_tag(repo: str, old_version: str) -> str:
3941
if old_version in ("main", "master"):
4042
return old_version
4143
tags = get_repo_tags(repo)
42-
logging.info(tags)
44+
logger.info(tags)
4345
same_length_tags = [tag for tag in tags if len(tag) == len(old_version)]
44-
logging.info(same_length_tags)
46+
logger.info(same_length_tags)
4547
same_length_tags.sort(reverse=True)
46-
logging.info(same_length_tags)
48+
logger.info(same_length_tags)
4749
try:
4850
tag = same_length_tags[0]
4951
except IndexError:
@@ -80,7 +82,7 @@ def do_file(filename: str, dry_run: bool) -> None:
8082
version = m[3]
8183
if repo == "pypa/gh-action-pypi-publish" and version == "release":
8284
new_lines.append(line)
83-
logging.info("%s's '%s' is a branch not tag, skipping", repo, version)
85+
logger.info("%s's '%s' is a branch not tag, skipping", repo, version)
8486
continue
8587
new_version = update_tag(repo, version)
8688
if new_version and version != new_version:
@@ -136,18 +138,18 @@ def main() -> None:
136138
level=args.loglevel, format="%(message)s", handlers=[RichHandler()]
137139
)
138140
else:
139-
logging.basicConfig(level=args.loglevel, format="%(message)s")
141+
logger.basicConfig(level=args.loglevel, format="%(message)s")
140142

141143
if os.path.isfile(args.input):
142144
do_file(args.input, args.dry_run)
143145
else:
144146
for path in Path(args.input).rglob("*.y*ml"):
145-
logging.info(path)
147+
logger.info(path)
146148
do_file(str(path), args.dry_run)
147149
print()
148150

149-
logging.info("update_tag:\t%s", update_tag.cache_info())
150-
logging.info("get_repo_tags:\t%s", get_repo_tags.cache_info())
151+
logger.info("update_tag:\t%s", update_tag.cache_info())
152+
logger.info("get_repo_tags:\t%s", get_repo_tags.cache_info())
151153

152154

153155
if __name__ == "__main__":

0 commit comments

Comments
 (0)