From 568139a9597fad847e9fe05ae5f2b29edbd5715a Mon Sep 17 00:00:00 2001 From: AraHaan Date: Mon, 4 Dec 2017 23:14:59 -0500 Subject: [PATCH 1/6] bpo-32217: Fixed freeze.py for Windows. On Windows freeze was never going to work because of this issue. This fix should hopefully make freeze work on Windows again for now. --- Tools/freeze/freeze.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Tools/freeze/freeze.py b/Tools/freeze/freeze.py index d602f585397534..2236546ec0dbb6 100755 --- a/Tools/freeze/freeze.py +++ b/Tools/freeze/freeze.py @@ -217,7 +217,12 @@ def main(): # locations derived from options version = '%d.%d' % sys.version_info[:2] - flagged_version = version + sys.abiflags + if sys.platform != "win32": + # on Windows this will make freeze traceback + # because abiflags is not in sys. + flaggedver_sion = version + sys.abiflags + else: + flaggedver_sion = version if win: extensions_c = 'frozen_extensions.c' if ishome: From dfc9b53edc20e34b73154fd910b15f05c61034a5 Mon Sep 17 00:00:00 2001 From: AraHaan Date: Mon, 4 Dec 2017 23:19:03 -0500 Subject: [PATCH 2/6] bpo-32217: Fixed varible typo. --- Tools/freeze/freeze.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/freeze/freeze.py b/Tools/freeze/freeze.py index 2236546ec0dbb6..cc401036dde950 100755 --- a/Tools/freeze/freeze.py +++ b/Tools/freeze/freeze.py @@ -220,9 +220,9 @@ def main(): if sys.platform != "win32": # on Windows this will make freeze traceback # because abiflags is not in sys. - flaggedver_sion = version + sys.abiflags + flagged_version = version + sys.abiflags else: - flaggedver_sion = version + flagged_version = version if win: extensions_c = 'frozen_extensions.c' if ishome: From 57b66057fe9c00147d0d7825db560faae18535d4 Mon Sep 17 00:00:00 2001 From: AraHaan Date: Tue, 19 Dec 2017 20:42:50 -0500 Subject: [PATCH 3/6] bpo-32217: Add news entry. --- .../next/Tools-Demos/2017-12-19-20-42-36.bpo-32217.axXcjA.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Tools-Demos/2017-12-19-20-42-36.bpo-32217.axXcjA.rst diff --git a/Misc/NEWS.d/next/Tools-Demos/2017-12-19-20-42-36.bpo-32217.axXcjA.rst b/Misc/NEWS.d/next/Tools-Demos/2017-12-19-20-42-36.bpo-32217.axXcjA.rst new file mode 100644 index 00000000000000..67feb9e9c3c542 --- /dev/null +++ b/Misc/NEWS.d/next/Tools-Demos/2017-12-19-20-42-36.bpo-32217.axXcjA.rst @@ -0,0 +1 @@ +Fix freeze script on Windows. From 57c3c55959e59b5ddb5a5e1f09ad8aa00d66bbce Mon Sep 17 00:00:00 2001 From: AraHaan <15173749+AraHaan@users.noreply.github.com> Date: Mon, 18 Mar 2019 15:42:14 -0400 Subject: [PATCH 4/6] Address pr feedback. --- Tools/freeze/freeze.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/freeze/freeze.py b/Tools/freeze/freeze.py index cc401036dde950..c19b66f7b2d5cf 100755 --- a/Tools/freeze/freeze.py +++ b/Tools/freeze/freeze.py @@ -217,7 +217,7 @@ def main(): # locations derived from options version = '%d.%d' % sys.version_info[:2] - if sys.platform != "win32": + if not win: # on Windows this will make freeze traceback # because abiflags is not in sys. flagged_version = version + sys.abiflags From 283f482537cca842ad6641a7f418a3cca1f6c369 Mon Sep 17 00:00:00 2001 From: AraHaan <15173749+AraHaan@users.noreply.github.com> Date: Thu, 21 Mar 2019 15:41:29 -0400 Subject: [PATCH 5/6] Address pr feedback. --- Tools/freeze/freeze.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/freeze/freeze.py b/Tools/freeze/freeze.py index c19b66f7b2d5cf..3af024c32d8c21 100755 --- a/Tools/freeze/freeze.py +++ b/Tools/freeze/freeze.py @@ -217,7 +217,7 @@ def main(): # locations derived from options version = '%d.%d' % sys.version_info[:2] - if not win: + if hasattr(sys, 'abiflags'): # on Windows this will make freeze traceback # because abiflags is not in sys. flagged_version = version + sys.abiflags From 6dd5c4922761a6793dd0738431220cdf46dbe8a3 Mon Sep 17 00:00:00 2001 From: AraHaan <15173749+AraHaan@users.noreply.github.com> Date: Fri, 22 Mar 2019 10:26:41 -0400 Subject: [PATCH 6/6] Address pr feedback. --- Tools/freeze/freeze.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/Tools/freeze/freeze.py b/Tools/freeze/freeze.py index 3af024c32d8c21..a09bfa8abb0f4f 100755 --- a/Tools/freeze/freeze.py +++ b/Tools/freeze/freeze.py @@ -218,8 +218,6 @@ def main(): # locations derived from options version = '%d.%d' % sys.version_info[:2] if hasattr(sys, 'abiflags'): - # on Windows this will make freeze traceback - # because abiflags is not in sys. flagged_version = version + sys.abiflags else: flagged_version = version