8000 gh-103977: compile re expressions in platform.py only if required by eendebakpt · Pull Request #103981 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-103977: compile re expressions in platform.py only if required #103981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Apr 30, 2023
Merged

gh-103977: compile re expressions in platform.py only if required #103981

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c8f51fd
compile re expressions only if required
eendebakpt Apr 21, 2023
def8f54
📜🤖 Added by blurb_it.
blurb-it[bot] Apr 28, 2023
ffee320
Merge branch 'main' into platform_re_compile
eendebakpt Apr 28, 2023
4061a6b
revert _os_release_cache
eendebakpt Apr 28, 2023
d64373d
whitespace
eendebakpt Apr 28, 2023
3933b5d
Merge branch 'main' into platform_re_compile
eendebakpt Apr 28, 2023
082fb8b
Merge branch 'main' into platform_re_compile
eendebakpt Apr 29, 2023
da59bfe
patchcheck
eendebakpt Apr 29, 2023
e0253a8
revert changes to coding20731.py
eendebakpt Apr 29, 2023
470ddc4
review comments
eendebakpt Apr 29, 2023
4e5724e
Merge branch 'main' into platform_re_compile
eendebakpt Apr 29, 2023
6119af2
Update Misc/NEWS.d/next/Library/2023-04-28-19-08-50.gh-issue-103977.m…
eendebakpt Apr 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
revert _os_release_cache
  • Loading branch information
@eendebakpt
eendebakpt committed Apr 28, 2023
commit 4061a6b32407c9bea44acbe445eec448e35f6592
7 changes: 3 additions & 4 deletions Lib/platform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1292,6 +1292,9 @@ def platform(aliased=False, terse=False):
### freedesktop.org os-release standard
# https://www.freedesktop.org/software/systemd/man/os-release.html

# /etc takes precedence over /usr/lib
_os_release_candidates = ("/etc/os-release", "/usr/lib/os-release")
_os_release_cache = None

def _parse_os_release(lines):
# These fields are mandatory fields with well-known defaults
Expand Down Expand Up @@ -1325,10 +1328,6 @@ def freedesktop_os_release():
"""
global _os_release_cache

# /etc takes precedence over /usr/lib
_os_release_candidates = ("/etc/os-release", "/usr/lib/os-release")
_os_release_cache = None

if _os_release_cache is None:
errno = None
for candidate in _os_release_candidates:
Expand Down
0