Skip to content

Commit 8290a76

Browse files
committed
update host module 3.4.2
1 parent 2af11a2 commit 8290a76

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

CADRuntime/CADRuntime.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
</ItemGroup>
5555
<ItemGroup>
5656
<EmbeddedResource Include="Resources\PythonScript16x16.png" />
57-
<None Remove="Resources\IronPython.3.4.0.zip" />
58-
<EmbeddedResource Include="Resources\IronPython.3.4.0.zip" />
57+
<None Remove="Resources\IronPython.StdLib.3.4.2.zip" />
58+
<EmbeddedResource Include="Resources\IronPython.StdLib.3.4.2.zip" />
5959
</ItemGroup>
6060
<ItemGroup>
6161
<EmbeddedResource Include="Resources\PythonScript32x32.png" />
@@ -64,8 +64,8 @@
6464
<EmbeddedResource Include="Resources\python_27_lib.zip" />
6565
</ItemGroup>
6666
<ItemGroup>
67-
<PackageReference Include="DynamicLanguageRuntime" Version="1.3.3" />
68-
<PackageReference Include="IronPython" Version="3.4.0" />
67+
<PackageReference Include="DynamicLanguageRuntime" Version="1.3.5" />
68+
<PackageReference Include="IronPython" Version="3.4.2" />
6969
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
7070
<PackageReference Include="System.Resources.Extensions" Version="6.0.0" />
7171
</ItemGroup>
4.77 MB
Binary file not shown.

CADRuntime/ScriptExecutor.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,9 @@ private void AddEmbeddedLib(ScriptEngine engine)
103103
{
104104
// use embedded python lib
105105
var asm = this.GetType().Assembly;
106-
var resQuery = from name in asm.GetManifestResourceNames()
107-
where name.ToLowerInvariant().EndsWith("ironpython.3.4.0.zip")
106+
string[] resourceNames = asm.GetManifestResourceNames();
107+
var resQuery = from name in resourceNames
108+
where name.ToLowerInvariant().EndsWith("ironpython.stdlib.3.4.2.zip")
108109
select name;
109110
var resName = resQuery.Single();
110111
var importer = new IronPython.Modules.ResourceMetaPathImporter(asm, resName);

PythonConsoleControl/PythonConsoleHost.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,11 @@ protected override ScriptRuntimeSetup CreateRuntimeSetup()
126126
langSetup.Options["SearchPaths"] = new string[0];
127127
}
128128
}
129+
129130
return srs;
130131
}
131132

132-
protected override void ParseHostOptions(string/*!*/[]/*!*/ args)
133+
protected override void ParseHostOptions(string /*!*/[] /*!*/ args)
133134
{
134135
// Python doesn't want any of the DLR base options.
135136
foreach (string s in args)

0 commit comments

Comments
 (0)