Skip to content

gh-102491: Remove IronPython version check in sys_version #102492

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
hauntsaninja merged 8 commits into from
Mar 19, 2023
+10 −51
Merged

gh-102491: Remove IronPython version check in sys_version #102492

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c8845bc
remove ironpython python 2.x version check
eendebakpt Mar 7, 2023
b9d0b33
remove old tests; add a new test for python 3.x
eendebakpt Mar 7, 2023
0b51602
increase coverage of _sys.version test
eendebakpt Mar 7, 2023
e56ddfc
fix test
eendebakpt Mar 7, 2023
839baae
📜🤖 Added by blurb_it.
blurb-it[bot] Mar 8, 2023
7ffe733
remove IronPython version checks
eendebakpt Mar 12, 2023
e9ab84a
Merge branch 'main' into remove_ironpython_python2
eendebakpt Mar 12, 2023
165b510
Merge branch 'main' into remove_ironpython_python2
eendebakpt Mar 19, 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
Next Next commit
remove ironpython python 2.x version check
  • Loading branch information
@eendebakpt
eendebakpt committed Mar 7, 2023
commit c8845bcddbc47b506298a250c18d86eaf11a0e13
13 changes: 1 addition & 12 deletions Lib/platform.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1046,14 +1046,6 @@ def processor():
r'(?: \(([\d\.]+)\))?'
r' on (.NET [\d\.]+)', re.ASCII)

# IronPython covering 2.6 and 2.7
_ironpython26_sys_version_parser = re.compile(
r'([\d.]+)\s*'
r'\(IronPython\s*'
r'[\d.]+\s*'
r'\(([\d.]+)\) on ([\w.]+ [\d.]+(?: \(\d+-bit\))?)\)'
)

_pypy_sys_version_parser = re.compile(
r'([\w.+]+)\s*'
r'\(#?([^,]+),\s*([\w ]+),\s*([\w :]+)\)\s*'
Expand Down Expand Up @@ -1094,10 +1086,7 @@ def _sys_version(sys_version=None):
if 'IronPython' in sys_version:
# IronPython
name = 'IronPython'
if sys_version.startswith('IronPython'):
match = _ironpython_sys_version_parser.match(sys_version)
else:
match = _ironpython26_sys_version_parser.match(sys_version)
match = _ironpython_sys_version_parser.match(sys_version)

if match is None:
raise ValueError(
Expand Down