Merge branch 'master' into add_scope

denfromufa · web-flow · commit 60ce28b23605 · 2017-05-24T11:28:21.000-05:00
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -19,6 +19,7 @@
 -   Christopher Pow ([@christopherpow](https://github.com/christopherpow))
 -   Daniel Fernandez ([@fdanny](https://github.com/fdanny))
 -   Daniel Santana ([@dgsantana](https://github.com/dgsantana))
+-   Dave Hirschfeld ([@dhirschfeld](https://github.com/dhirschfeld))
 -   David Lechner ([@dlech](https://github.com/dlech))
 -   Dmitriy Se ([@dmitriyse](https://github.com/dmitriyse))
 -   He-chien Tsai ([@t3476](https://github.com/t3476))
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 ### Added
 -   Added clr.GetClrType (#432)(#433)
 -   Added `Foo` feature
+-   Allowed passing None for nullable args (#460)
 
 ### Changed
 
diff --git a/setup.py b/setup.py
@@ -209,7 +209,7 @@ def build_extension(self, ext):
             'pythonnet.sln',
             '/p:Configuration={}'.format(_config),
             '/p:Platform={}'.format(ARCH),
-            '/p:DefineConstants="{}"'.format(','.join(defines)),
+            '/p:DefineConstants="{}"'.format('%3B'.join(defines)),
             '/p:PythonBuildDir="{}"'.format(os.path.abspath(dest_dir)),
             '/p:PythonInteropFile="{}"'.format(os.path.basename(interop_file)),
             '/verbosity:{}'.format(VERBOSITY),
diff --git a/src/embed_tests/Python.EmbeddingTest.csproj b/src/embed_tests/Python.EmbeddingTest.csproj
@@ -116,6 +116,6 @@
   </PropertyGroup>
   <Target Name="AfterBuild">
     <Copy SourceFiles="$(TargetAssembly)" DestinationFolder="$(PythonBuildDir)" />
-    <Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" />
+    <!--Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" /-->
   </Target>
 </Project>
diff --git a/src/runtime/Python.Runtime.csproj b/src/runtime/Python.Runtime.csproj
@@ -162,6 +162,6 @@
   </PropertyGroup>
   <Target Name="AfterBuild">
     <Copy SourceFiles="$(TargetAssembly)" DestinationFolder="$(PythonBuildDir)" />
-    <Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" />
+    <!--Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" /-->
   </Target>
 </Project>
diff --git a/src/runtime/converter.cs b/src/runtime/converter.cs
@@ -318,6 +318,17 @@ internal static bool ToManagedValue(IntPtr value, Type obType,
                 return true;
             }
 
+            if (obType.IsGenericType && obType.GetGenericTypeDefinition() == typeof(Nullable<>))
+            {
+                if( value == Runtime.PyNone )
+                {
+                    result = null;
+                    return true;
+                }
+                // Set type to underlying type
+                obType = obType.GetGenericArguments()[0];
+            }
+
             if (obType.IsArray)
             {
                 return ToArray(value, obType, out result, setError);
diff --git a/src/testing/Python.Test.csproj b/src/testing/Python.Test.csproj
@@ -108,6 +108,6 @@
   </PropertyGroup>
   <Target Name="AfterBuild">
     <Copy SourceFiles="$(TargetAssembly)" DestinationFolder="$(SolutionDir)\src\tests\fixtures" />
-    <Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" />
+    <!--Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" /-->
   </Target>
 </Project>
diff --git a/src/testing/conversiontest.cs b/src/testing/conversiontest.cs
@@ -32,8 +32,14 @@ public ConversionTest()
 
         public byte[] ByteArrayField;
         public sbyte[] SByteArrayField;
+
+        public T? Echo<T>(T? arg) where T: struct {
+            return arg;
+        }
+
     }
 
+    
 
     public interface ISpam
     {
diff --git a/src/tests/test_conversion.py b/src/tests/test_conversion.py
@@ -641,6 +641,8 @@ def test_enum_conversion():
 
 def test_null_conversion():
     """Test null conversion."""
+    import System
+    
     ob = ConversionTest()
 
     ob.StringField = None
@@ -652,6 +654,10 @@ def test_null_conversion():
     ob.SpamField = None
     assert ob.SpamField is None
 
+    pi = 22/7
+    assert ob.Echo[System.Double](pi) == pi
+    assert ob.Echo[System.DateTime](None) is None
+
     # Primitive types and enums should not be set to null.
 
     with pytest.raises(TypeError):
diff --git a/tools/nuget/nuget.exe b/tools/nuget/nuget.exe

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,14 @@ public ConversionTest()`
`32`	`32`
`33`	`33`	`public byte[] ByteArrayField;`
`34`	`34`	`public sbyte[] SByteArrayField;`
	`35`	`+`
	`36`	`+ public T? Echo<T>(T? arg) where T: struct {`
	`37`	`+ return arg;`
	`38`	`+ }`
	`39`	`+`
`35`	`40`	`}`
`36`	`41`
	`42`	`+`
`37`	`43`
`38`	`44`	`public interface ISpam`
`39`	`45`	`{`