Merge branch 'master' into 449_Py_Initialize_SignalConfiguration

filmor · web-flow · commit 168ec06d4910 · 2018-10-29T13:29:06.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 -   Fixed Visual Studio 2017 compat ([#434][i434]) for setup.py
 -   Fixed crashes when integrating pythonnet in Unity3d ([#714][i714]),
     related to unloading the Application Domain
+-   Fixed interop methods with Py_ssize_t. NetCoreApp 2.0 is more sensitive than net40 and requires this fix. ([#531][p531])
 -   Fixed crash on exit of the Python interpreter if a python class
     derived from a .NET class has a `__namespace__` or `__assembly__`
     attribute ([#481][i481])
@@ -689,3 +690,4 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 [p163]: https://github.com/pythonnet/pythonnet/pull/163
 [p625]: https://github.com/pythonnet/pythonnet/pull/625
 [i131]: https://github.com/pythonnet/pythonnet/issues/131
+[p531]: https://github.com/pythonnet/pythonnet/pull/531
diff --git a/src/embed_tests/TestPySequence.cs b/src/embed_tests/TestPySequence.cs
@@ -69,10 +69,8 @@ public void TestRepeat()
             PyObject actual = t1.Repeat(3);
             Assert.AreEqual("FooFooFoo", actual.ToString());
 
-            // On 32 bit system this argument should be int, but on the 64 bit system this should be long value.
-            // This works on the Framework 4.0 accidentally, it should produce out of memory!
-            // actual = t1.Repeat(-3);
-            // Assert.AreEqual("", actual.ToString());
+            actual = t1.Repeat(-3);
+            Assert.AreEqual("", actual.ToString());
         }
 
         [Test]
diff --git a/src/runtime/arrayobject.cs b/src/runtime/arrayobject.cs
@@ -93,7 +93,7 @@ public static IntPtr mp_subscript(IntPtr ob, IntPtr idx)
                 return IntPtr.Zero;
             }
 
-            int count = Runtime.PyTuple_Size(idx);
+            var count = Runtime.PyTuple_Size(idx);
 
             var args = new int[count];
 
@@ -186,7 +186,7 @@ public static int mp_ass_subscript(IntPtr ob, IntPtr idx, IntPtr v)
                 return -1;
             }
 
-            int count = Runtime.PyTuple_Size(idx);
+            var count = Runtime.PyTuple_Size(idx);
             var args = new int[count];
 
             for (var i = 0; i < count; i++)
diff --git a/src/runtime/assemblymanager.cs b/src/runtime/assemblymanager.cs
@@ -140,7 +140,7 @@ private static Assembly ResolveHandler(object ob, ResolveEventArgs args)
         internal static void UpdatePath()
         {
             IntPtr list = Runtime.PySys_GetObject("path");
-            int count = Runtime.PyList_Size(list);
+            var count = Runtime.PyList_Size(list);
             if (count != pypath.Count)
             {
                 pypath.Clear();
diff --git a/src/runtime/classobject.cs b/src/runtime/classobject.cs
@@ -230,10 +230,10 @@ public static int mp_ass_subscript(IntPtr ob, IntPtr idx, IntPtr v)
             }
 
             // Get the args passed in.
-            int i = Runtime.PyTuple_Size(args);
+            var i = Runtime.PyTuple_Size(args);
             IntPtr defaultArgs = cls.indexer.GetDefaultArgs(args);
-            int numOfDefaultArgs = Runtime.PyTuple_Size(defaultArgs);
-            int temp = i + numOfDefaultArgs;
+            var numOfDefaultArgs = Runtime.PyTuple_Size(defaultArgs);
+            var temp = i + numOfDefaultArgs;
             IntPtr real = Runtime.PyTuple_New(temp + 1);
             for (var n = 0; n < i; n++)
             {
diff --git a/src/runtime/converter.cs b/src/runtime/converter.cs
@@ -842,7 +842,7 @@ private static void SetConversionError(IntPtr value, Type target)
         private static bool ToArray(IntPtr value, Type obType, out object result, bool setError)
         {
             Type elementType = obType.GetElementType();
-            int size = Runtime.PySequence_Size(value);
+            var size = Runtime.PySequence_Size(value);
             result = null;
 
             if (size < 0)
diff --git a/src/runtime/exceptions.cs b/src/runtime/exceptions.cs
@@ -276,7 +276,7 @@ public static void SetError(Exception e)
         /// </remarks>
         public static bool ErrorOccurred()
         {
-            return Runtime.PyErr_Occurred() != 0;
+            return Runtime.PyErr_Occurred() != IntPtr.Zero;
         }
 
         /// <summary>
diff --git a/src/runtime/importhook.cs b/src/runtime/importhook.cs
@@ -155,7 +155,7 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw)
             // hook is saved as this.py_import. This version handles CLR
             // import and defers to the normal builtin for everything else.
 
-            int num_args = Runtime.PyTuple_Size(args);
+            var num_args = Runtime.PyTuple_Size(args);
             if (num_args < 1)
             {
                 return Exceptions.RaiseTypeError("__import__() takes at least 1 argument (0 given)");
diff --git a/src/runtime/indexer.cs b/src/runtime/indexer.cs
@@ -56,7 +56,7 @@ internal void SetItem(IntPtr inst, IntPtr args)
 
         internal bool NeedsDefaultArgs(IntPtr args)
         {
-            int pynargs = Runtime.PyTuple_Size(args);
+            var pynargs = Runtime.PyTuple_Size(args);
             MethodBase[] methods = SetterBinder.GetMethods();
             if (methods.Length == 0)
             {
@@ -72,7 +72,7 @@ internal bool NeedsDefaultArgs(IntPtr args)
                 return false;
             }
 
-            for (int v = pynargs; v < clrnargs; v++)
+            for (var v = pynargs; v < clrnargs; v++)
             {
                 if (pi[v].DefaultValue == DBNull.Value)
                 {
@@ -95,7 +95,7 @@ internal IntPtr GetDefaultArgs(IntPtr args)
             {
                 return Runtime.PyTuple_New(0);
             }
-            int pynargs = Runtime.PyTuple_Size(args);
+            var pynargs = Runtime.PyTuple_Size(args);
 
             // Get the default arg tuple
             MethodBase[] methods = SetterBinder.GetMethods();
diff --git a/src/runtime/interfaceobject.cs b/src/runtime/interfaceobject.cs
@@ -36,7 +36,7 @@ static InterfaceObject()
         public static IntPtr tp_new(IntPtr tp, IntPtr args, IntPtr kw)
         {
             var self = (InterfaceObject)GetManagedObject(tp);
-            int nargs = Runtime.PyTuple_Size(args);
+            var nargs = Runtime.PyTuple_Size(args);
             Type type = self.type;
             object obj;
 
diff --git a/src/runtime/metatype.cs b/src/runtime/metatype.cs
@@ -29,7 +29,7 @@ public static IntPtr Initialize()
         /// </summary>
         public static IntPtr tp_new(IntPtr tp, IntPtr args, IntPtr kw)
         {
-            int len = Runtime.PyTuple_Size(args);
+            var len = Runtime.PyTuple_Size(args);
             if (len < 3)
             {
                 return Exceptions.RaiseTypeError("invalid argument list");
diff --git a/src/runtime/methodbinder.cs b/src/runtime/methodbinder.cs
@@ -279,7 +279,7 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw, MethodBase info, Meth
         {
             // loop to find match, return invoker w/ or /wo error
             MethodBase[] _methods = null;
-            int pynargs = Runtime.PyTuple_Size(args);
+            var pynargs = (int)Runtime.PyTuple_Size(args);
             object arg;
             var isGeneric = false;
             ArrayList defaultArgList = null;
@@ -301,9 +301,9 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw, MethodBase info, Meth
                     isGeneric = true;
                 }
                 ParameterInfo[] pi = mi.GetParameters();
-                int clrnargs = pi.Length;
+                var clrnargs = pi.Length;
                 var match = false;
-                int arrayStart = -1;
+                var arrayStart = -1;
                 var outs = 0;
 
                 if (pynargs == clrnargs)
@@ -314,7 +314,7 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw, MethodBase info, Meth
                 {
                     match = true;
                     defaultArgList = new ArrayList();
-                    for (int v = pynargs; v < clrnargs; v++)
+                    for (var v = pynargs; v < clrnargs; v++)
                     {
                         if (pi[v].DefaultValue == DBNull.Value)
                         {
@@ -338,7 +338,7 @@ internal Binding Bind(IntPtr inst, IntPtr args, IntPtr kw, MethodBase info, Meth
                 {
                     var margs = new object[clrnargs];
 
-                    for (var n = 0; n < clrnargs; n++)
+                    for (int n = 0; n < clrnargs; n++)
                     {
                         IntPtr op;
                         if (n < pynargs)
diff --git a/src/runtime/methodbinding.cs b/src/runtime/methodbinding.cs
@@ -104,7 +104,7 @@ public static IntPtr tp_call(IntPtr ob, IntPtr args, IntPtr kw)
             {
                 if (self.info.IsGenericMethod)
                 {
-                    int len = Runtime.PyTuple_Size(args); //FIXME: Never used
+                    var len = Runtime.PyTuple_Size(args); //FIXME: Never used
                     Type[] sigTp = Runtime.PythonArgsToTypeArray(args, true);
                     if (sigTp != null)
                     {
@@ -129,7 +129,7 @@ public static IntPtr tp_call(IntPtr ob, IntPtr args, IntPtr kw)
 
                 if (target == IntPtr.Zero && !self.m.IsStatic())
                 {
-                    int len = Runtime.PyTuple_Size(args);
+                    var len = Runtime.PyTuple_Size(args);
                     if (len < 1)
                     {
                         Exceptions.SetError(Exceptions.TypeError, "not enough arguments");
diff --git a/src/runtime/pyobject.cs b/src/runtime/pyobject.cs
@@ -519,9 +519,9 @@ public virtual void DelItem(int index)
         /// Returns the length for objects that support the Python sequence
         /// protocol, or 0 if the object does not support the protocol.
         /// </remarks>
-        public virtual int Length()
+        public virtual long Length()
         {
-            int s = Runtime.PyObject_Size(obj);
+            var s = Runtime.PyObject_Size(obj);
             if (s < 0)
             {
                 Runtime.PyErr_Clear();
diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public static IntPtr mp_subscript(IntPtr ob, IntPtr idx)`
`93`	`93`	`return IntPtr.Zero;`
`94`	`94`	`}`
`95`	`95`
`96`		`- int count = Runtime.PyTuple_Size(idx);`
	`96`	`+ var count = Runtime.PyTuple_Size(idx);`
`97`	`97`
`98`	`98`	`var args = new int[count];`
`99`	`99`
`@@ -186,7 +186,7 @@ public static int mp_ass_subscript(IntPtr ob, IntPtr idx, IntPtr v)`
`186`	`186`	`return -1;`
`187`	`187`	`}`
`188`	`188`
`189`		`- int count = Runtime.PyTuple_Size(idx);`
	`189`	`+ var count = Runtime.PyTuple_Size(idx);`
`190`	`190`	`var args = new int[count];`
`191`	`191`
`192`	`192`	`for (var i = 0; i < count; i++)`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ private static Assembly ResolveHandler(object ob, ResolveEventArgs args)`
`140`	`140`	`internal static void UpdatePath()`
`141`	`141`	`{`
`142`	`142`	`IntPtr list = Runtime.PySys_GetObject("path");`
`143`		`- int count = Runtime.PyList_Size(list);`
	`143`	`+ var count = Runtime.PyList_Size(list);`
`144`	`144`	`if (count != pypath.Count)`
`145`	`145`	`{`
`146`	`146`	`pypath.Clear();`
Original file line number	Diff line number	Diff line change
`@@ -230,10 +230,10 @@ public static int mp_ass_subscript(IntPtr ob, IntPtr idx, IntPtr v)`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`// Get the args passed in.`
`233`		`- int i = Runtime.PyTuple_Size(args);`
	`233`	`+ var i = Runtime.PyTuple_Size(args);`
`234`	`234`	`IntPtr defaultArgs = cls.indexer.GetDefaultArgs(args);`
`235`		`- int numOfDefaultArgs = Runtime.PyTuple_Size(defaultArgs);`
`236`		`- int temp = i + numOfDefaultArgs;`
	`235`	`+ var numOfDefaultArgs = Runtime.PyTuple_Size(defaultArgs);`
	`236`	`+ var temp = i + numOfDefaultArgs;`
`237`	`237`	`IntPtr real = Runtime.PyTuple_New(temp + 1);`
`238`	`238`	`for (var n = 0; n < i; n++)`
`239`	`239`	`{`
Original file line number	Diff line number	Diff line change
`@@ -842,7 +842,7 @@ private static void SetConversionError(IntPtr value, Type target)`
`842`	`842`	`private static bool ToArray(IntPtr value, Type obType, out object result, bool setError)`
`843`	`843`	`{`
`844`	`844`	`Type elementType = obType.GetElementType();`
`845`		`- int size = Runtime.PySequence_Size(value);`
	`845`	`+ var size = Runtime.PySequence_Size(value);`
`846`	`846`	`result = null;`
`847`	`847`
`848`	`848`	`if (size < 0)`
Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ public static void SetError(Exception e)`
`276`	`276`	`/// </remarks>`
`277`	`277`	`public static bool ErrorOccurred()`
`278`	`278`	`{`
`279`		`- return Runtime.PyErr_Occurred() != 0;`
	`279`	`+ return Runtime.PyErr_Occurred() != IntPtr.Zero;`
`280`	`280`	`}`
`281`	`281`
`282`	`282`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ public static IntPtr __import__(IntPtr self, IntPtr args, IntPtr kw)`
`155`	`155`	`// hook is saved as this.py_import. This version handles CLR`
`156`	`156`	`// import and defers to the normal builtin for everything else.`
`157`	`157`
`158`		`- int num_args = Runtime.PyTuple_Size(args);`
	`158`	`+ var num_args = Runtime.PyTuple_Size(args);`
`159`	`159`	`if (num_args < 1)`
`160`	`160`	`{`
`161`	`161`	`return Exceptions.RaiseTypeError("__import__() takes at least 1 argument (0 given)");`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ internal void SetItem(IntPtr inst, IntPtr args)`
`56`	`56`
`57`	`57`	`internal bool NeedsDefaultArgs(IntPtr args)`
`58`	`58`	`{`
`59`		`- int pynargs = Runtime.PyTuple_Size(args);`
	`59`	`+ var pynargs = Runtime.PyTuple_Size(args);`
`60`	`60`	`MethodBase[] methods = SetterBinder.GetMethods();`
`61`	`61`	`if (methods.Length == 0)`
`62`	`62`	`{`
`@@ -72,7 +72,7 @@ internal bool NeedsDefaultArgs(IntPtr args)`
`72`	`72`	`return false;`
`73`	`73`	`}`
`74`	`74`
`75`		`- for (int v = pynargs; v < clrnargs; v++)`
	`75`	`+ for (var v = pynargs; v < clrnargs; v++)`
`76`	`76`	`{`
`77`	`77`	`if (pi[v].DefaultValue == DBNull.Value)`
`78`	`78`	`{`
`@@ -95,7 +95,7 @@ internal IntPtr GetDefaultArgs(IntPtr args)`
`95`	`95`	`{`
`96`	`96`	`return Runtime.PyTuple_New(0);`
`97`	`97`	`}`
`98`		`- int pynargs = Runtime.PyTuple_Size(args);`
	`98`	`+ var pynargs = Runtime.PyTuple_Size(args);`
`99`	`99`
`100`	`100`	`// Get the default arg tuple`
`101`	`101`	`MethodBase[] methods = SetterBinder.GetMethods();`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ static InterfaceObject()`
`36`	`36`	`public static IntPtr tp_new(IntPtr tp, IntPtr args, IntPtr kw)`
`37`	`37`	`{`
`38`	`38`	`var self = (InterfaceObject)GetManagedObject(tp);`
`39`		`- int nargs = Runtime.PyTuple_Size(args);`
	`39`	`+ var nargs = Runtime.PyTuple_Size(args);`
`40`	`40`	`Type type = self.type;`
`41`	`41`	`object obj;`
`42`	`42`