Skip to content

Commit 3fb030f

Browse files
zoobazooba
committed
Revert file association changes
1 parent 07cb22e commit 3fb030f

File tree

2 files changed

+78
-79
lines changed

2 files changed

+78
-79
lines changed

‎src/pymanager/appxmanifest.xml‎

Lines changed: 71 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4"
99
xmlns:desktop6="http://schemas.microsoft.com/appx/manifest/desktop/windows10/6"
1010
xmlns:desktop7="http://schemas.microsoft.com/appx/manifest/desktop/windows10/7"
11-
xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3"
1211
xmlns:uap4="http://schemas.microsoft.com/appx/manifest/uap/windows10/4"
1312
xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
1413
xmlns:uap13="http://schemas.microsoft.com/appx/manifest/uap/windows10/13"
@@ -109,53 +108,6 @@
109108
<uap5:ExecutionAlias Alias="py.exe" />
110109
</uap5:AppExecutionAlias>
111110
</uap5:Extension>
112-
<uap3:Extension Category="windows.fileTypeAssociation">
113-
<uap3:FileTypeAssociation Name="py" Parameters="exec --__fix-cwd &quot;%1&quot; %*">
114-
<uap:DisplayName>Python Script</uap:DisplayName>
115-
<uap:InfoTip>Python Script</uap:InfoTip>
116-
<uap:Logo>_resources/pyx256.png</uap:Logo>
117-
<desktop7:Logo>_resources/py.ico</desktop7:Logo>
118-
<uap:EditFlags OpenIsSafe="false" />
119-
<uap:SupportedFileTypes>
120-
<uap:FileType ContentType="text/x-python"
121-
uap4:ShellNewFileName="templates\template.py">.py</uap:FileType>
122-
</uap:SupportedFileTypes>
123-
</uap3:FileTypeAssociation>
124-
</uap3:Extension>
125-
<uap3:Extension Category="windows.fileTypeAssociation">
126-
<uap3:FileTypeAssociation Name="pyc" Parameters="exec --__fix-cwd &quot;%1&quot; %*">
127-
<uap:DisplayName>Compiled Python Script</uap:DisplayName>
128-
<uap:InfoTip>Compiled Python Script</uap:InfoTip>
129-
<desktop7:Logo>_resources/pyc.ico</desktop7:Logo>
130-
<uap:EditFlags OpenIsSafe="false" AlwaysUnsafe="true" />
131-
<uap:SupportedFileTypes>
132-
<uap:FileType ContentType="application/x-python-code">.pyc</uap:FileType>
133-
</uap:SupportedFileTypes>
134-
</uap3:FileTypeAssociation>
135-
</uap3:Extension>
136-
<uap3:Extension Category="windows.fileTypeAssociation">
137-
<uap3:FileTypeAssociation Name="pyd">
138-
<uap:DisplayName>Python Extension Module</uap:DisplayName>
139-
<uap:InfoTip>Python Extension Module</uap:InfoTip>
140-
<desktop7:Logo>_resources/pyd.ico</desktop7:Logo>
141-
<uap:EditFlags OpenIsSafe="false" AlwaysUnsafe="true" />
142-
<uap:SupportedFileTypes>
143-
<uap:FileType ContentType="application/x-python-pyd">.pyd</uap:FileType>
144-
</uap:SupportedFileTypes>
145-
</uap3:FileTypeAssociation>
146-
</uap3:Extension>
147-
<uap3:Extension Category="windows.fileTypeAssociation">
148-
<uap3:FileTypeAssociation Name="pyz" Parameters="exec --__fix-cwd &quot;%1&quot; %*">
149-
<uap:DisplayName>Python Application</uap:DisplayName>
150-
<uap:InfoTip>Python Application</uap:InfoTip>
151-
<uap:Logo>_resources/pythonx150.png</uap:Logo>
152-
<desktop7:Logo>_resources/python.ico</desktop7:Logo>
153-
<uap:EditFlags OpenIsSafe="false" />
154-
<uap:SupportedFileTypes>
155-
<uap:FileType ContentType="application/x-python-zipapp">.pyz</uap:FileType>
156-
</uap:SupportedFileTypes>
157-
</uap3:FileTypeAssociation>
158-
</uap3:Extension>
159111
</Extensions>
160112
</Application>
161113
<Application Id="Pyw.Exe"
@@ -175,30 +127,6 @@
175127
<uap5:ExecutionAlias Alias="pyw.exe" />
176128
</uap5:AppExecutionAlias>
177129
</uap5:Extension>
178-
<uap3:Extension Category="windows.fileTypeAssociation">
179-
<uap3:FileTypeAssociation Name="pyw" Parameters="exec --__fix-cwd &quot;%1&quot; %*">
180-
<uap:DisplayName>Python Script (Windowed)</uap:DisplayName>
181-
<uap:InfoTip>Python Script (Windowed)</uap:InfoTip>
182-
<uap:Logo>_resources/pyx256.png</uap:Logo>
183-
<desktop7:Logo>_resources/py.ico</desktop7:Logo>
184-
<uap:EditFlags OpenIsSafe="false" />
185-
<uap:SupportedFileTypes>
186-
<uap:FileType ContentType="text/x-python">.pyw</uap:FileType>
187-
</uap:SupportedFileTypes>
188-
</uap3:FileTypeAssociation>
189-
</uap3:Extension>
190-
<uap3:Extension Category="windows.fileTypeAssociation">
191-
<uap3:FileTypeAssociation Name="pyzw" Parameters="exec --__fix-cwd &quot;%1&quot; %*">
192-
<uap:DisplayName>Python Application (Windowed)</uap:DisplayName>
193-
<uap:InfoTip>Python Application (Windowed)</uap:InfoTip>
194-
<uap:Logo>_resources/pythonwx150.png</uap:Logo>
195-
<desktop7:Logo>_resources/pythonw.ico</desktop7:Logo>
196-
<uap:EditFlags OpenIsSafe="false" />
197-
<uap:SupportedFileTypes>
198-
<uap:FileType ContentType="application/x-python-zipapp">.pyzw</uap:FileType>
199-
</uap:SupportedFileTypes>
200-
</uap3:FileTypeAssociation>
201-
</uap3:Extension>
202130
</Extensions>
203131
</Application>
204132

@@ -219,6 +147,53 @@
219147
<uap5:ExecutionAlias Alias="python.exe" />
220148
</uap5:AppExecutionAlias>
221149
</uap5:Extension>
150+
<uap:Extension Category="windows.fileTypeAssociation">
151+
<uap:FileTypeAssociation Name="py">
152+
<uap:DisplayName>Python Script</uap:DisplayName>
153+
<uap:InfoTip>Python Script</uap:InfoTip>
154+
<uap:Logo>_resources/pyx256.png</uap:Logo>
155+
<desktop7:Logo>_resources/py.ico</desktop7:Logo>
156+
<uap:EditFlags OpenIsSafe="false" />
157+
<uap:SupportedFileTypes>
158+
<uap:FileType ContentType="text/x-python"
159+
uap4:ShellNewFileName="templates\template.py">.py</uap:FileType>
160+
</uap:SupportedFileTypes>
161+
</uap:FileTypeAssociation>
162+
</uap:Extension>
163+
<uap:Extension Category="windows.fileTypeAssociation">
164+
<uap:FileTypeAssociation Name="pyc">
165+
<uap:DisplayName>Compiled Python Script</uap:DisplayName>
166+
<uap:InfoTip>Compiled Python Script</uap:InfoTip>
167+
<desktop7:Logo>_resources/pyc.ico</desktop7:Logo>
168+
<uap:EditFlags OpenIsSafe="false" AlwaysUnsafe="true" />
169+
<uap:SupportedFileTypes>
170+
<uap:FileType ContentType="application/x-python-code">.pyc</uap:FileType>
171+
</uap:SupportedFileTypes>
172+
</uap:FileTypeAssociation>
173+
</uap:Extension>
174+
<uap:Extension Category="windows.fileTypeAssociation">
175+
<uap:FileTypeAssociation Name="pyd">
176+
<uap:DisplayName>Python Extension Module</uap:DisplayName>
177+
<uap:InfoTip>Python Extension Module</uap:InfoTip>
178+
<desktop7:Logo>_resources/pyd.ico</desktop7:Logo>
179+
<uap:EditFlags OpenIsSafe="false" AlwaysUnsafe="true" />
180+
<uap:SupportedFileTypes>
181+
<uap:FileType ContentType="application/x-python-pyd">.pyd</uap:FileType>
182+
</uap:SupportedFileTypes>
183+
</uap:FileTypeAssociation>
184+
</uap:Extension>
185+
<uap:Extension Category="windows.fileTypeAssociation">
186+
<uap:FileTypeAssociation Name="pyz">
187+
<uap:DisplayName>Python Application</uap:DisplayName>
188+
<uap:InfoTip>Python Application</uap:InfoTip>
189+
<uap:Logo>_resources/pythonx150.png</uap:Logo>
190+
<desktop7:Logo>_resources/python.ico</desktop7:Logo>
191+
<uap:EditFlags OpenIsSafe="false" />
192+
<uap:SupportedFileTypes>
193+
<uap:FileType ContentType="application/x-python-zipapp">.pyz</uap:FileType>
194+
</uap:SupportedFileTypes>
195+
</uap:FileTypeAssociation>
196+
</uap:Extension>
222197
<desktop4:Extension Category="windows.fileExplorerContextMenus">
223198
<desktop4:FileExplorerContextMenus>
224199
<desktop4:ItemType Type=".py">
@@ -273,6 +248,30 @@
273248
<uap5:ExecutionAlias Alias="pythonw.exe" />
274249
</uap5:AppExecutionAlias>
275250
</uap5:Extension>
251+
<uap:Extension Category="windows.fileTypeAssociation">
252+
<uap:FileTypeAssociation Name="pyw">
253+
<uap:DisplayName>Python Script (Windowed)</uap:DisplayName>
254+
<uap:InfoTip>Python Script (Windowed)</uap:InfoTip>
255+
<uap:Logo>_resources/pyx256.png</uap:Logo>
256+
<desktop7:Logo>_resources/py.ico</desktop7:Logo>
257+
<uap:EditFlags OpenIsSafe="false" />
258+
<uap:SupportedFileTypes>
259+
<uap:FileType ContentType="text/x-python">.pyw</uap:FileType>
260+
</uap:SupportedFileTypes>
261+
</uap:FileTypeAssociation>
262+
</uap:Extension>
263+
<uap:Extension Category="windows.fileTypeAssociation">
264+
<uap:FileTypeAssociation Name="pyzw">
265+
<uap:DisplayName>Python Application (Windowed)</uap:DisplayName>
266+
<uap:InfoTip>Python Application (Windowed)</uap:InfoTip>
267+
<uap:Logo>_resources/pythonwx150.png</uap:Logo>
268+
<desktop7:Logo>_resources/pythonw.ico</desktop7:Logo>
269+
<uap:EditFlags OpenIsSafe="false" />
270+
<uap:SupportedFileTypes>
271+
<uap:FileType ContentType="application/x-python-zipapp">.pyzw</uap:FileType>
272+
</uap:SupportedFileTypes>
273+
</uap:FileTypeAssociation>
274+
</uap:Extension>
276275
</Extensions>
277276
</Application>
278277
</Applications>

‎src/pymanager/msi.wxs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@
3737
<Component Id="ProductComponent" Directory="INSTALLFOLDER" Guid="8BEC1259-B220-499B-9656-DC59B7F5BE24">
3838
<File KeyPath="yes" Source="py-manager.exe" Name="python.exe" Id="python.exe" />
3939
<File Source="pymanager.exe" Name="pymanager.exe" />
40-
<File Source="py.exe" Name="py.exe" Id="py.exe" />
40+
<File Source="py.exe" Name="py.exe" />
4141
<File Source="python3.exe" Name="python3.exe" />
4242
<File Source="pythonw.exe" Name="pythonw.exe" Id="pythonw.exe" />
4343
<File Source="pywmanager.exe" Name="pywmanager.exe" />
44-
<File Source="pyw.exe" Name="pyw.exe" Id="pyw.exe" />
44+
<File Source="pyw.exe" Name="pyw.exe" />
4545
<File Source="pymanager.json" />
4646

4747
<File Source="vcruntime140.dll" />
@@ -56,7 +56,7 @@
5656

5757
<ProgId Id="Python.File" Description="Python Script" Advertise="no" Icon="py.ico">
5858
<Extension Id="py" ContentType="text/x-python">
59-
<Verb Id="open" TargetFile="py.exe" Argument="exec --__fix-cwd &quot;%1&quot; %*" />
59+
<Verb Id="open" TargetFile="python.exe" Argument="&quot;%1&quot; %*" />
6060
</Extension>
6161
</ProgId>
6262
<RegistryValue Root="HKCR" Key="Python.File\shell\EditWithIDLE"
@@ -66,25 +66,25 @@
6666

6767
<ProgId Id="Python.NoConFile" Description="Python Script (Windowed)" Advertise="no" Icon="py.ico">
6868
<Extension Id="pyw" ContentType="text/x-python">
69-
<Verb Id="open" TargetFile="pyw.exe" Argument="exec --__fix-cwd &quot;%1&quot; %*" />
69+
<Verb Id="open" TargetFile="pythonw.exe" Argument="&quot;%1&quot; %*" />
7070
</Extension>
7171
</ProgId>
7272
<ProgId Id="Python.CompiledFile" Description="Compiled Python Script" Advertise="no" Icon="pyc.ico">
7373
<Extension Id="pyc" ContentType="application/x-python-code">
74-
<Verb Id="open" TargetFile="py.exe" Argument="exec --__fix-cwd &quot;%1&quot; %*" />
74+
<Verb Id="open" TargetFile="python.exe" Argument="&quot;%1&quot; %*" />
7575
</Extension>
7676
</ProgId>
7777
<ProgId Id="Python.Extension" Description="Python Extension Module" Advertise="no" Icon="pyd.ico">
7878
<Extension Id="pyd" ContentType="application/x-python-pyd" />
7979
</ProgId>
8080
<ProgId Id="Python.ArchiveFile" Description="Python Application" Advertise="no" Icon="python.exe">
8181
<Extension Id="pyz" ContentType="application/x-python-zipapp">
82-
<Verb Id="open" TargetFile="py.exe" Argument="exec --__fix-cwd &quot;%1&quot; %*" />
82+
<Verb Id="open" TargetFile="python.exe" Argument="&quot;%1&quot; %*" />
8383
</Extension>
8484
</ProgId>
8585
<ProgId Id="Python.NoConArchiveFile" Description="Python Application (Windowed)" Advertise="no" Icon="pythonw.exe">
8686
<Extension Id="pyzw" ContentType="application/x-python-zipapp">
87-
<Verb Id="open" TargetFile="pyw.exe" Argument="exec --__fix-cwd &quot;%1&quot; %*" />
87+
<Verb Id="open" TargetFile="pythonw.exe" Argument="&quot;%1&quot; %*" />
8888
</Extension>
8989
</ProgId>
9090
</Component>

0 commit comments

Comments
 (0)