summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-11-07 18:54:47 +0000
committerMartin v. Löwis <martin@v.loewis.de>2008-11-07 18:54:47 +0000
commit49ae612f740fcfbc45bbc0300931387a9843ed51 (patch)
treeceab59e8898231e246ae982af86db2eb987b1c3a
parentf7eec7c4ca3af64fdb9cdd1fd4d7605161933eb9 (diff)
downloadcpython-git-49ae612f740fcfbc45bbc0300931387a9843ed51.tar.gz
Merged revisions 67149 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r67149 | martin.v.loewis | 2008-11-07 19:51:50 +0100 (Fr, 07 Nov 2008) | 1 line Issue #1656675: Register a drop handler for .py* files on Windows. ........
-rw-r--r--Misc/NEWS2
-rw-r--r--Tools/msi/msi.py8
2 files changed, 10 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 8d2b1cbea6..b9db17bb90 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -57,6 +57,8 @@ Library
Build
-----
+- Issue #1656675: Register a drop handler for .py* files on Windows.
+
- Issue #4120: Exclude manifest from extension modules in VS2008.
- Issue #4091: Install pythonxy.dll in system32 again.
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 0614cc2d0d..9e20938c00 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1181,6 +1181,7 @@ def add_registry(db):
ewi = "Edit with IDLE"
pat2 = r"Software\Classes\%sPython.%sFile\DefaultIcon"
pat3 = r"Software\Classes\%sPython.%sFile"
+ pat4 = r"Software\Classes\%sPython.%sFile\shellex\DropHandler"
tcl_verbs = []
if have_tcl:
tcl_verbs=[
@@ -1228,6 +1229,13 @@ def add_registry(db):
"Python File (no console)", "REGISTRY.def"),
("pyc.txt", -1, pat3 % (testprefix, "Compiled"), "",
"Compiled Python File", "REGISTRY.def"),
+ # Drop Handler
+ ("py.drop", -1, pat4 % (testprefix, ""), "",
+ "{60254CA5-953B-11CF-8C96-00AA00B8708C}", "REGISTRY.def"),
+ ("pyw.drop", -1, pat4 % (testprefix, "NoCon"), "",
+ "{60254CA5-953B-11CF-8C96-00AA00B8708C}", "REGISTRY.def"),
+ ("pyc.drop", -1, pat4 % (testprefix, "Compiled"), "",
+ "{60254CA5-953B-11CF-8C96-00AA00B8708C}", "REGISTRY.def"),
])
# Registry keys