Implement named arguments and With semantics in C# embedding side #461
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,120 +1,122 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> | ||
| <PropertyGroup> | ||
| <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
| <ProjectGuid>{4165C59D-2822-499F-A6DB-EACA4C331EB5}</ProjectGuid> | ||
| <OutputType>Library</OutputType> | ||
| <AssemblyName>Python.EmbeddingTest</AssemblyName> | ||
| <RootNamespace>Python.EmbeddingTest</RootNamespace> | ||
| <DocumentationFile>bin\Python.EmbeddingTest.xml</DocumentationFile> | ||
| <OutputPath>bin\</OutputPath> | ||
| <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> | ||
| <TargetFrameworkProfile /> | ||
| <NoWarn>1591</NoWarn> | ||
| <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> | ||
| <PythonBuildDir Condition=" '$(PythonBuildDir)' == '' ">$(SolutionDir)\bin\</PythonBuildDir> | ||
| <LangVersion>6</LangVersion> | ||
| <RestorePackages>true</RestorePackages> | ||
| <ErrorReport>prompt</ErrorReport> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Platform)' == 'x86'"> | ||
| <PlatformTarget>x86</PlatformTarget> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Platform)' == 'x64'"> | ||
| <PlatformTarget>x64</PlatformTarget> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)' == 'DebugMono'"> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| <DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants> | ||
| <DebugType>full</DebugType> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'"> | ||
| <DefineConstants Condition="'$(DefineConstants)' == ''"> | ||
| </DefineConstants> | ||
| <Optimize>true</Optimize> | ||
| <DebugType>pdbonly</DebugType> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'"> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| <DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants> | ||
| <DebugType>full</DebugType> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'"> | ||
| <DefineConstants Condition="'$(DefineConstants)' == ''"> | ||
| </DefineConstants> | ||
| <Optimize>true</Optimize> | ||
| <DebugType>pdbonly</DebugType> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'"> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| <DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants> | ||
| <DebugType>full</DebugType> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'"> | ||
| <DefineConstants Condition="'$(DefineConstants)' == ''"> | ||
| </DefineConstants> | ||
| <Optimize>true</Optimize> | ||
| <DebugType>pdbonly</DebugType> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'"> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| <DefineConstants Condition="'$(DefineConstants)' == ''">DEBUG;TRACE</DefineConstants> | ||
| <DebugType>full</DebugType> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'"> | ||
| <DefineConstants Condition="'$(DefineConstants)' == ''"> | ||
| </DefineConstants> | ||
| <Optimize>true</Optimize> | ||
| <DebugType>pdbonly</DebugType> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <Reference Include="Microsoft.CSharp" /> | ||
| <Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL"> | ||
| <HintPath>..\..\packages\NUnit.3.6.0\lib\net40\nunit.framework.dll</HintPath> | ||
| </Reference> | ||
| <Reference Include="System" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <None Include="..\pythonnet.snk" /> | ||
| <None Include="packages.config" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Compile Include="dynamic.cs" /> | ||
| <Compile Include="pyimport.cs" /> | ||
| <Compile Include="pyinitialize.cs" /> | ||
| <Compile Include="pyrunstring.cs" /> | ||
| <Compile Include="TestCustomMarshal.cs" /> | ||
| <Compile Include="TestExample.cs" /> | ||
| <Compile Include="TestPyAnsiString.cs" /> | ||
| <Compile Include="TestPyFloat.cs" /> | ||
| <Compile Include="TestPyInt.cs" /> | ||
| <Compile Include="TestPyList.cs" /> | ||
| <Compile Include="TestPyLong.cs" /> | ||
| <Compile Include="TestPyNumber.cs" /> | ||
| <Compile Include="TestPySequence.cs" /> | ||
| <Compile Include="TestPyString.cs" /> | ||
| <Compile Include="TestPythonException.cs" /> | ||
| <Compile Include="TestPythonEngineProperties.cs" /> | ||
| <Compile Include="TestPyTuple.cs" /> | ||
| <Compile Include="TestNamedArguments.cs" /> | ||
| <Compile Include="TestPyWith.cs" /> | ||
| <Compile Include="TestRuntime.cs" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ProjectReference Include="..\runtime\Python.Runtime.csproj"> | ||
| <Project>{097B4AC0-74E9-4C58-BCF8-C69746EC8271}</Project> | ||
| <Name>Python.Runtime</Name> | ||
| </ProjectReference> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> | ||
| </ItemGroup> | ||
| <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> | ||
| <PropertyGroup> | ||
| <TargetAssembly>$(TargetPath)</TargetAssembly> | ||
| <TargetAssemblyPdb>$(TargetDir)$(TargetName).pdb</TargetAssemblyPdb> | ||
| </PropertyGroup> | ||
| <Target Name="AfterBuild"> | ||
| <Copy SourceFiles="$(TargetAssembly)" DestinationFolder="$(PythonBuildDir)" /> | ||
| <Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" /> | ||
| </Target> | ||
| </Project> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| using System; | ||
| using NUnit.Framework; | ||
| using Python.Runtime; | ||
|
|
||
| namespace Python.EmbeddingTest | ||
| { | ||
| public class TestNamedArguments | ||
| { | ||
| [OneTimeSetUp] | ||
| public void SetUp() | ||
| { | ||
| PythonEngine.Initialize(); | ||
| } | ||
|
|
||
| [OneTimeTearDown] | ||
| public void Dispose() | ||
| { | ||
| PythonEngine.Shutdown(); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Test named arguments support through Py.kw method | ||
| /// </summary> | ||
| [Test] | ||
| public void TestKeywordArgs() | ||
| { | ||
| dynamic a = CreateTestClass(); | ||
| var result = (int)a.Test3(2, Py.kw("a4", 8)); | ||
|
|
||
| Assert.AreEqual(12, result); | ||
| } | ||
|
|
||
|
|
||
| /// <summary> | ||
| /// Test keyword arguments with .net named arguments | ||
| /// </summary> | ||
| [Test] | ||
| public void TestNamedArgs() | ||
| { | ||
| dynamic a = CreateTestClass(); | ||
| var result = (int)a.Test3(2, a4: 8); | ||
|
|
||
| Assert.AreEqual(12, result); | ||
| } | ||
|
|
||
|
|
||
|
|
||
| private static PyObject CreateTestClass() | ||
| { | ||
| var locals = new PyDict(); | ||
|
|
||
| PythonEngine.Exec(@" | ||
| class cmTest3: | ||
| def Test3(self, a1 = 1, a2 = 1, a3 = 1, a4 = 1): | ||
| return a1 + a2 + a3 + a4 | ||
|
|
||
| a = cmTest3() | ||
| ", null, locals.Handle); | ||
|
|
||
| return locals.GetItem("a"); | ||
| } | ||
|
|
||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| using System; | ||
| using NUnit.Framework; | ||
| using Python.Runtime; | ||
|
|
||
| namespace Python.EmbeddingTest | ||
| { | ||
| public class TestPyWith | ||
| { | ||
| [OneTimeSetUp] | ||
| public void SetUp() | ||
| { | ||
| PythonEngine.Initialize(); | ||
| } | ||
|
|
||
| [OneTimeTearDown] | ||
| public void Dispose() | ||
| { | ||
| PythonEngine.Shutdown(); | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Test that exception is raised in context manager that ignores it. | ||
| /// </summary> | ||
| [Test] | ||
| public void TestWithPositive() | ||
| { | ||
| var locals = new PyDict(); | ||
|
|
||
| PythonEngine.Exec(@" | ||
| class cmTest: | ||
|
Member
There was a problem hiding this comment. Python convention for classes is |
||
| def __enter__(self): | ||
| print('Enter') | ||
| return self | ||
| def __exit__(self, t, v, tb): | ||
| # Exception not handled, return will be False | ||
| print('Exit') | ||
| def fail(self): | ||
| return 5 / 0 | ||
|
|
||
| a = cmTest() | ||
| ", null, locals.Handle); | ||
|
|
||
| var a = locals.GetItem("a"); | ||
|
|
||
| try | ||
| { | ||
| Py.With(a, cmTest => | ||
| { | ||
| cmTest.fail(); | ||
| }); | ||
| } | ||
| catch (PythonException e) | ||
| { | ||
| Assert.IsTrue(e.Message.Contains("division by zero")); | ||
| } | ||
| } | ||
|
|
||
|
|
||
| /// <summary> | ||
| /// Test that exception is not raised in context manager that handles it | ||
| /// </summary> | ||
| [Test] | ||
| public void TestWithNegative() | ||
| { | ||
| var locals = new PyDict(); | ||
|
|
||
| PythonEngine.Exec(@" | ||
| class cmTest: | ||
| def __enter__(self): | ||
| print('Enter') | ||
| return self | ||
| def __exit__(self, t, v, tb): | ||
| # Signal exception is handled by returning true | ||
| return True | ||
| def fail(self): | ||
| return 5 / 0 | ||
|
|
||
| a = cmTest() | ||
| ", null, locals.Handle); | ||
|
|
||
| var a = locals.GetItem("a"); | ||
| Py.With(a, cmTest => | ||
| { | ||
| cmTest.fail(); | ||
| }); | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please try to keep the line-endings as they were (is
autocrlfset?).