summaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2020-05-19 12:42:52 (GMT)
committerGitHub <noreply@github.com>2020-05-19 12:42:52 (GMT)
commit46fc3ec056ff7ce65e9b96f14bd0b06aa1d0c62d (patch)
tree39e92cf0f7190ff63174b3e349edd7a324303d10 /Tools
parent560d6436611900bc23d3dd1158acbe6fa39b2c9b (diff)
downloadcpython-46fc3ec056ff7ce65e9b96f14bd0b06aa1d0c62d.zip
cpython-46fc3ec056ff7ce65e9b96f14bd0b06aa1d0c62d.tar.gz
cpython-46fc3ec056ff7ce65e9b96f14bd0b06aa1d0c62d.tar.bz2
bpo-39631: Fix file association MIME type in the Windows installer (GH-20205)
Use text/x-python instead of text/plain to avoid issues with tools assuming that "ShellExecute(script)" is a non-executable operation. (cherry picked from commit 8c862e51248c5ebfec787badec88eb58c9267e1e) Co-authored-by: Zackery Spytz <zspytz@gmail.com>
Diffstat (limited to 'Tools')
-rw-r--r--Tools/msi/launcher/launcher_reg.wxs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Tools/msi/launcher/launcher_reg.wxs b/Tools/msi/launcher/launcher_reg.wxs
index dace97e..e8d9d24 100644
--- a/Tools/msi/launcher/launcher_reg.wxs
+++ b/Tools/msi/launcher/launcher_reg.wxs
@@ -6,14 +6,14 @@
<RegistryValue KeyPath="yes" Root="HKMU" Key="Software\Python\PyLauncher" Name="AssociateFiles" Value="1" Type="integer" />
<ProgId Id="Python.File" Description="!(loc.PythonFileDescription)" Advertise="no" Icon="py.exe" IconIndex="1">
- <Extension Id="py" ContentType="text/plain">
+ <Extension Id="py" ContentType="text/x-python">
<Verb Id="open" TargetFile="py.exe" Argument="&quot;%L&quot; %*" />
</Extension>
</ProgId>
<RegistryValue Root="HKCR" Key="Python.File\shellex\DropHandler" Value="{BEA218D2-6950-497B-9434-61683EC065FE}" Type="string" />
<ProgId Id="Python.NoConFile" Description="!(loc.PythonNoConFileDescription)" Advertise="no" Icon="py.exe" IconIndex="1">
- <Extension Id="pyw" ContentType="text/plain">
+ <Extension Id="pyw" ContentType="text/x-python">
<Verb Id="open" TargetFile="pyw.exe" Argument="&quot;%L&quot; %*" />
</Extension>
</ProgId>