Thanks to visit codestin.com
Credit goes to github.com

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
JelleZijlstra merged 12 commits into from
Apr 30, 2023
+40 −36
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
review comments
  • Loading branch information
@eendebakpt
eendebakpt committed Apr 29, 2023
commit 470ddc4c69104f3ba762a9140cc7518d7dd6c187
30 changes: 15 additions & 15 deletions Lib/platform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,11 @@
'pl': 200, 'p': 200,
}

_component_re = re.compile(r'([0-9]+|[._+-])')

def _comparable_version(version):
component_re = re.compile(r'([0-9]+|[._+-])')
result = []
for v in _component_re.split(version):
for v in component_re.split(version):
if v not in '._+-':
try:
v = int(v, 10)
Expand Down Expand Up @@ -185,7 +185,7 @@ def libc_ver(executable=None, lib='', version='', chunksize=16384):
# sys.executable is not set.
return lib, version

_libc_search = re.compile(b'(__libc_init)'
libc_search = re.compile(b'(__libc_init)'
b'|'
b'(GLIBC_([0-9.]+))'
b'|'
Expand All @@ -201,7 +201,7 @@ def libc_ver(executable=None, lib='', version='', chunksize=16384):
pos = 0
while pos < len(binary):
if b'libc' in binary or b'GLIBC' in binary:
m = _libc_search.search(binary, pos)
m = libc_search.search(binary, pos)
else:
m = None
if not m or m.end() == len(binary):
Expand Down Expand Up @@ -293,13 +293,13 @@ def _syscmd_ver(system='', release='', version='',
else:
return system, release, version

_ver_output = re.compile(r'(?:([\w ]+) ([\w.]+) '
ver_output = re.compile(r'(?:([\w ]+) ([\w.]+) '
r'.*'
r'\[.* ([\d.]+)\])')

# Parse the output
info = info.strip()
m = _ver_output.match(info)
m = ver_output.match(info)
if m is not None:
system, release, version = m.groups()
# Strip trailing dots from version and release
Expand Down Expand Up @@ -1066,7 +1066,7 @@ def _sys_version(sys_version=None):
if result is not None:
return result

_sys_version_parser = re.compile(
sys_version_parser = re.compile(
r'([\w.+]+)\s*' # "version<space>"
r'\(#?([^,]+)' # "(#buildno"
r'(?:,\s*([\w ]*)' # ", builddate"
Expand All @@ -1076,7 +1076,7 @@ def _sys_version(sys_version=None):
if sys.platform.startswith('java'):
# Jython
name = 'Jython'
match = _sys_version_parser.match(sys_version)
match = sys_version_parser.match(sys_version)
if match is None:
raise ValueError(
'failed to parse Jython sys.version: %s' %
Expand All @@ -1088,13 +1088,13 @@ def _sys_version(sys_version=None):

elif "PyPy" in sys_version:
# PyPy
_pypy_sys_version_parser = re.compile(
pypy_sys_version_parser = re.compile(
r'([\w.+]+)\s*'
r'\(#?([^,]+),\s*([\w ]+),\s*([\w :]+)\)\s*'
r'\[PyPy [^\]]+\]?')

name = "PyPy"
match = _pypy_sys_version_parser.match(sys_version)
match = pypy_sys_version_parser.match(sys_version)
if match is None:
raise ValueError("failed to parse PyPy sys.version: %s" %
repr(sys_version))
Expand All @@ -1103,7 +1103,7 @@ def _sys_version(sys_version=None):

else:
# CPython
match = _sys_version_parser.match(sys_version)
match = sys_version_parser.match(sys_version)
if match is None:
raise ValueError(
'failed to parse CPython sys.version: %s' %
Expand Down Expand Up @@ -1308,16 +1308,16 @@ def _parse_os_release(lines):

# NAME=value with optional quotes (' or "). The regular expression is less
# strict than shell lexer, but that's ok.
_os_release_line = re.compile(
os_release_line = re.compile(
"^(?P<name>[a-zA-Z0-9_]+)=(?P<quote>[\"\']?)(?P<value>.*)(?P=quote)$"
)
# unescape five special characters mentioned in the standard
_os_release_unescape = re.compile(r"\\([\\\$\"\'`])")
os_release_unescape = re.compile(r"\\([\\\$\"\'`])")

for line in lines:
mo = _os_release_line.match(line)
mo = os_release_line.match(line)
if mo is not None:
info[mo.group('name')] = _os_release_unescape.sub(
info[mo.group('name')] = os_release_unescape.sub(
r"\1", mo.group('value')
)

Expand Down