summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2010-06-04 19:15:32 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2010-06-04 19:15:32 (GMT)
commit16b2a5e0a928bb1d49598aa34bf1bb5db7071863 (patch)
tree3ed2a9ebf737f61c5ea097695a59213c1514d099
parent5aafc17405127b728c66b2e7e516c1c9c4d660cb (diff)
downloadcpython-16b2a5e0a928bb1d49598aa34bf1bb5db7071863.zip
cpython-16b2a5e0a928bb1d49598aa34bf1bb5db7071863.tar.gz
cpython-16b2a5e0a928bb1d49598aa34bf1bb5db7071863.tar.bz2
Display installer warning that Windows 2000 won't
be supported in future releases.
-rw-r--r--Misc/NEWS3
-rw-r--r--Tools/msi/msi.py6
2 files changed, 6 insertions, 3 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 6540d9c..3a5a449 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -120,6 +120,9 @@ Tests
Build
-----
+- Display installer warning that Windows 2000 won't be supported in future
+ releases.
+
- Issues #1759169, #8864: Drop _XOPEN_SOURCE on Solaris, define it for
multiprocessing only.
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index a0d70de..d50b1aa 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -503,9 +503,9 @@ def add_ui(db):
" would still be Python for DOS.")
c = exit_dialog.text("warning", 135, 200, 220, 40, 0x30003,
- "{\\VerdanaRed9}Warning: Python 2.5.x is the last "
- "Python release for Windows 9x.")
- c.condition("Hide", "NOT Version9X")
+ "{\\VerdanaRed9}Warning: Python 2.7.x is the last "
+ "Python release for Windows 2000.")
+ c.condition("Hide", "VersionNT > 500")
exit_dialog.text("Description", 135, 235, 220, 20, 0x30003,
"Click the Finish button to exit the Installer.")