-
Notifications
You must be signed in to change notification settings - Fork 772
Implement named arguments and With semantics in C# embedding side #461
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
73c40fc
Added python "with" construction
dsuarezv 500d3d3
Added some unit tests for new With method
dsuarezv 35a7dc6
Renamed With tests for easier grouping
dsuarezv c3c1c56
Support for named arguments to invoke python methods
dsuarezv 6c27e84
Named argument tests cosmetic changed
dsuarezv a31c590
Merge branch 'master' into missing_func
filmor 66864ad
Fixed failing test in python 2.7
dsuarezv 93b1bda
Reset line endings in csproj to LF
dsuarezv 9f1c378
Merge branch 'master' into missing_func
dsuarezv File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Added some unit tests for new With method
- Loading branch information
commit 500d3d37a05e77b9f24f00431e5a8b9d03b77b26
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,121 @@ | ||
| <?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="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> | ||
| <?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="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> | ||
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?).