bpo-40459: Fix NameError in platform.py #19855

sweeneyde · 2020-05-02T04:27:21Z

https://bugs.python.org/issue40459

Lib/platform.py

bedevere-bot · 2020-05-02T16:32:42Z

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

…to platformfix

sweeneyde · 2020-05-02T19:58:39Z

I have made the requested changes; please review again.

bedevere-bot · 2020-05-02T19:58:42Z

Thanks for making the requested changes!

@corona10: please review the changes made to this pull request.

corona10

@sweeneyde

Misc/NEWS.d/next/Library/2020-05-02-04-29-31.bpo-40459.fSAYVD.rst

Co-authored-by: Dong-hee Na <donghee.na92@gmail.com>

vstinner · 2020-05-04T14:03:28Z

Lib/platform.py

-            with winreg.OpenKeyEx(HKEY_LOCAL_MACHINE, cvkey) as key:
-                ptype = QueryValueEx(key, 'CurrentType')[0]
+            with winreg.OpenKeyEx(winreg.HKEY_LOCAL_MACHINE, cvkey) as key:
+                ptype = winreg.QueryValueEx(key, 'CurrentType')[0]
        except:


Maybe this bug was never seend because of "except: pass". It's maybe time to use more precise errors?

Is except OSError: acceptable? Or are there any situations where this would raise an exception other than an OSError? And if so, is there a good reason why those are currently passing silently?

win32_edition() doesn't have the typo and it uses "except OSError: pass", so yeah I think that "except OSError:" is reasonable here.

vstinner · 2020-05-04T14:33:18Z

Misc/NEWS.d/next/Library/2020-05-02-04-29-31.bpo-40459.fSAYVD.rst

@@ -0,0 +1 @@
+Fix :exc:`NameError` caused from :func:`platform.win32_ver`.


The NEWS entry doesn't really explain the behavior change for users.

It seems like previously, ptype was always an empty string. ptype is now filled with the value of the "SOFTWARE\Microsoft\Windows NT\CurrentVersion" registry entry.

Can someone test on Windows to see how this string look like? I'm curious :-)

The documentation says:

As a hint: ptype is 'Uniprocessor Free' on single processor NT machines and 'Multiprocessor Free' on multi processor machines. The ‘Free’ refers to the OS version being free of debugging code. It could also state ‘Checked’ which means the OS version uses debugging code, i.e. code that checks arguments, ranges, etc.

https://docs.python.org/dev/library/platform.html#platform.win32_ver

Please explain that this change fix the ptype part of :func:platform.win32_ver result.

sweeneyde · 2020-05-04T21:08:44Z

@vstinner On my machine, this was before the change:

.\python.bat -c "import platform; print(platform.win32_ver())"
('10', '10.0.18362', 'SP0', '')

and after the change:

.\python.bat -c "import platform; print(platform.win32_ver())"
('10', '10.0.18362', 'SP0', 'Multiprocessor Free')

vstinner

ptype is empty since this change:

commit d307d05350e26a7a5f8f74db9af632a15215b50f
Author: Steve Dower <steve.dower@microsoft.com>
Date:   Mon Apr 22 11:40:12 2019 -0700

    Fixes platform.win32_ver on non-Windows platforms (GH-12912)

Hum, it seems like it's a regression introduced in Python 3.7.4.

In this case, it sounds ok to backport the change to Python 3.7 and 3.8.

vstinner · 2020-05-04T21:19:12Z

Lib/platform.py

-            with winreg.OpenKeyEx(HKEY_LOCAL_MACHINE, cvkey) as key:
-                ptype = QueryValueEx(key, 'CurrentType')[0]
+            with winreg.OpenKeyEx(winreg.HKEY_LOCAL_MACHINE, cvkey) as key:
+                ptype = winreg.QueryValueEx(key, 'CurrentType')[0]
        except:


win32_edition() doesn't have the typo and it uses "except OSError: pass", so yeah I think that "except OSError:" is reasonable here.

vstinner · 2020-05-04T21:19:42Z

Misc/NEWS.d/next/Library/2020-05-02-04-29-31.bpo-40459.fSAYVD.rst

@@ -0,0 +1 @@
+Fix :exc:`NameError` caused from :func:`platform.win32_ver`.


Please explain that this change fix the ptype part of :func:platform.win32_ver result.

vstinner · 2020-05-04T21:26:23Z

@corona10: Are you ok to take this change as the opportunity to replace "except: pass" with "except OSError: pass" to detect similar regressions in the future?

vstinner

Ok, now it LGTM.

@corona10: Would you mind to review the updated PR? If you are ok with it, please merge it.

sweeneyde · 2020-05-04T21:44:11Z

Would it be worth it to add a test case like

    @unittest.skipUnless(sys.platform.startswith('win'), "windows only test")
    def test_win32_ver(self):
        release, version, csd, ptype = platform.win32_ver()
        # are these all of the possibilities?
        ptype_options = ["Multiprocessor Free",
                         "Multiprocessor Checked",
                         "Uniprocessor Free",
                         "Uniprocessor Checked"]
        self.assertIn(ptype, ptype_options)

in test_platform?

vstinner · 2020-05-05T02:21:10Z

I expect that such test will likely fail on some specific Windows versions. I don't think that it's worth it.

vstinner · 2020-05-05T02:21:55Z

I approved the PR, there is no need to modify it anymore. Since there was a disagreement previously on the except, I'm now waiting for @corona10.

corona10

LGTM again :)

Thanks for the work @sweeneyde and for the review @vstinner

miss-islington · 2020-05-05T02:33:20Z

Thanks @sweeneyde for the PR, and @corona10 for merging it 🌮🎉.. I'm working now to backport this PR to: 3.7, 3.8.
🐍🍒⛏🤖

bedevere-bot · 2020-05-05T02:33:39Z

GH-19912 is a backport of this pull request to the 3.8 branch.

(cherry picked from commit 1e7e451) Co-authored-by: Dennis Sweeney <36520290+sweeneyde@users.noreply.github.com>

bedevere-bot · 2020-05-05T02:33:49Z

GH-19913 is a backport of this pull request to the 3.7 branch.

(cherry picked from commit 1e7e451) Co-authored-by: Dennis Sweeney <36520290+sweeneyde@users.noreply.github.com>

vstinner · 2020-05-05T02:57:38Z

Thanks for the fix @sweeneyde! I didn't expect that it would fix a real bug ;-) It's even better!

sweeneyde added 2 commits May 2, 2020 00:24

Fix NameError in platform.py

833e30a

undo addition of blank line

4357154

the-knights-who-say-ni added the CLA signed label May 2, 2020

bedevere-bot added the awaiting review label May 2, 2020

📜🤖 Added by blurb_it.

a09be25

corona10 reviewed May 2, 2020

View reviewed changes

Lib/platform.py Show resolved Hide resolved

corona10 requested changes May 2, 2020

View reviewed changes

Lib/platform.py Show resolved Hide resolved

bedevere-bot added awaiting changes and removed awaiting review labels May 2, 2020

corona10 requested a review from vstinner May 2, 2020 16:33

sweeneyde added 2 commits May 2, 2020 15:19

Don't change exception handling

3003dd4

Merge branch 'platformfix' of https://github.com/sweeneyde/cpython in…

06c999a

…to platformfix

bedevere-bot added awaiting change review and removed awaiting changes labels May 2, 2020

bedevere-bot requested a review from corona10 May 2, 2020 19:58

corona10 added needs backport to 3.7 labels May 3, 2020

corona10 approved these changes May 3, 2020

View reviewed changes

bedevere-bot added awaiting merge and removed awaiting change review labels May 3, 2020

corona10 reviewed May 3, 2020

View reviewed changes

Misc/NEWS.d/next/Library/2020-05-02-04-29-31.bpo-40459.fSAYVD.rst Outdated Show resolved Hide resolved

Better NEWS entry

29143c0

Co-authored-by: Dong-hee Na <donghee.na92@gmail.com>

vstinner reviewed May 4, 2020

View reviewed changes

put user-facing info in NEWS

944a3b5

vstinner reviewed May 4, 2020

View reviewed changes

Fix bare except

694fa07

vstinner approved these changes May 4, 2020

View reviewed changes

corona10 approved these changes May 5, 2020

View reviewed changes

corona10 merged commit 1e7e451 into python:master May 5, 2020

bedevere-bot removed awaiting merge needs backport to 3.8 labels May 5, 2020

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request May 5, 2020

bpo-40459: Fix NameError in platform.py (pythonGH-19855)

8916ae1

(cherry picked from commit 1e7e451) Co-authored-by: Dennis Sweeney <36520290+sweeneyde@users.noreply.github.com>

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request May 5, 2020

bpo-40459: Fix NameError in platform.py (pythonGH-19855)

b1651e2

(cherry picked from commit 1e7e451) Co-authored-by: Dennis Sweeney <36520290+sweeneyde@users.noreply.github.com>

bedevere-bot removed the needs backport to 3.7 label May 5, 2020

miss-islington added a commit that referenced this pull request May 5, 2020

bpo-40459: Fix NameError in platform.py (GH-19855)

8ddf915

(cherry picked from commit 1e7e451) Co-authored-by: Dennis Sweeney <36520290+sweeneyde@users.noreply.github.com>

miss-islington added a commit that referenced this pull request May 5, 2020

bpo-40459: Fix NameError in platform.py (GH-19855)

efc782d

(cherry picked from commit 1e7e451) Co-authored-by: Dennis Sweeney <36520290+sweeneyde@users.noreply.github.com>

sweeneyde deleted the platformfix branch January 25, 2022 23:10

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bpo-40459: Fix NameError in platform.py #19855

bpo-40459: Fix NameError in platform.py #19855

sweeneyde commented May 2, 2020 •

edited by bedevere-bot

Loading

bedevere-bot commented May 2, 2020

sweeneyde commented May 2, 2020

bedevere-bot commented May 2, 2020

corona10 left a comment

vstinner May 4, 2020

sweeneyde May 4, 2020

vstinner May 4, 2020

vstinner May 4, 2020

vstinner May 4, 2020

sweeneyde commented May 4, 2020

vstinner left a comment

vstinner May 4, 2020

vstinner May 4, 2020

vstinner commented May 4, 2020

vstinner left a comment

sweeneyde commented May 4, 2020

vstinner commented May 5, 2020

vstinner commented May 5, 2020

corona10 left a comment

miss-islington commented May 5, 2020

bedevere-bot commented May 5, 2020

bedevere-bot commented May 5, 2020

vstinner commented May 5, 2020

		@@ -0,0 +1 @@
		Fix :exc:`NameError` caused from :func:`platform.win32_ver`.

bpo-40459: Fix NameError in platform.py #19855

bpo-40459: Fix NameError in platform.py #19855

Conversation

sweeneyde commented May 2, 2020 • edited by bedevere-bot Loading

bedevere-bot commented May 2, 2020

sweeneyde commented May 2, 2020

bedevere-bot commented May 2, 2020

corona10 left a comment

Choose a reason for hiding this comment

vstinner May 4, 2020

Choose a reason for hiding this comment

sweeneyde May 4, 2020

Choose a reason for hiding this comment

vstinner May 4, 2020

Choose a reason for hiding this comment

vstinner May 4, 2020

Choose a reason for hiding this comment

vstinner May 4, 2020

Choose a reason for hiding this comment

sweeneyde commented May 4, 2020

vstinner left a comment

Choose a reason for hiding this comment

vstinner May 4, 2020

Choose a reason for hiding this comment

vstinner May 4, 2020

Choose a reason for hiding this comment

vstinner commented May 4, 2020

vstinner left a comment

Choose a reason for hiding this comment

sweeneyde commented May 4, 2020

vstinner commented May 5, 2020

vstinner commented May 5, 2020

corona10 left a comment

Choose a reason for hiding this comment

miss-islington commented May 5, 2020

bedevere-bot commented May 5, 2020

bedevere-bot commented May 5, 2020

vstinner commented May 5, 2020

sweeneyde commented May 2, 2020 •

edited by bedevere-bot

Loading