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.
........

diff --git a/Misc/NEWS b/Misc/NEWS
index 8d2b1cbea6684e67e6e19ac901f94ff446aa2ae4..b9db17bb904c3d4c86fba2a3fb889c4f3748817c 100644 (file)
--- 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 0614cc2d0d927ccf79a005d4fc4c0524c4747793..9e20938c00b22d9b5a9c8c340431015a1f7900fc 100644 (file)
--- 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