Skip to content

Commit d71a391

Browse files
filmorfilmor
authored
Merge branch 'master' into repr
2 parents 351d9ff + 93a8c83 commit d71a391

File tree

6 files changed

+17
-20
lines changed

6 files changed

+17
-20
lines changed

‎.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,10 @@ UpgradeLog*.htm
5757

5858
# Coverity
5959
cov-int/
60+
61+
# Visual Studio Code
62+
.vscode/*
63+
!.vscode/settings.json
64+
!.vscode/tasks.json
65+
!.vscode/launch.json
66+
!.vscode/extensions.json

‎.travis.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ matrix:
2323
- dotnet-runtime-2.0.0
2424
- dotnet-sdk-2.0.0
2525

26-
- python: 3.4
27-
env: *xplat-env
28-
addons: *xplat-addons
29-
3026
- python: 3.5
3127
env: *xplat-env
3228
addons: *xplat-addons
@@ -59,9 +55,6 @@ matrix:
5955
- BUILD_OPTS=
6056
- NUNIT_PATH=./packages/NUnit.*/tools/nunit3-console.exe
6157

62-
- python: 3.4
63-
env: *classic-env
64-
6558
- python: 3.5
6659
env: *classic-env
6760

‎appveyor.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,13 @@ environment:
1717
matrix:
1818
- PYTHON_VERSION: 2.7
1919
BUILD_OPTS: --xplat
20-
- PYTHON_VERSION: 3.4
21-
BUILD_OPTS: --xplat
2220
- PYTHON_VERSION: 3.5
2321
BUILD_OPTS: --xplat
2422
- PYTHON_VERSION: 3.6
2523
BUILD_OPTS: --xplat
2624
- PYTHON_VERSION: 3.7
2725
BUILD_OPTS: --xplat
2826
- PYTHON_VERSION: 2.7
29-
- PYTHON_VERSION: 3.4
3027
- PYTHON_VERSION: 3.5
3128
- PYTHON_VERSION: 3.6
3229
- PYTHON_VERSION: 3.7

‎src/embed_tests/TestTypeManager.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@ public static void TestMemoryMapping()
5454
// We can't use compiler flags because we compile with MONO_LINUX
5555
// while running on the Microsoft .NET Core during continuous
5656
// integration tests.
57-
if (System.Type.GetType ("Mono.Runtime") != null)
57+
/* if (System.Type.GetType ("Mono.Runtime") != null)
5858
{
5959
// Mono throws NRE instead of AccessViolationException for some reason.
6060
Assert.That(() => { Marshal.WriteInt64(page, 73); }, Throws.TypeOf<System.NullReferenceException>());
6161
Assert.That(Marshal.ReadInt64(page), Is.EqualTo(17));
62-
}
62+
} */
6363
}
6464
}
6565
}

‎src/runtime/pyobject.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public object AsManagedObject(Type t)
101101
}
102102
return result;
103103
}
104-
104+
105105
/// <summary>
106106
/// As Method
107107
/// </summary>
@@ -1121,10 +1121,10 @@ public override bool TryBinaryOperation(BinaryOperationBinder binder, object arg
11211121
res = Runtime.PyNumber_InPlaceMultiply(this.obj, ((PyObject)arg).obj);
11221122
break;
11231123
case ExpressionType.Divide:
1124-
res = Runtime.PyNumber_Divide(this.obj, ((PyObject)arg).obj);
1124+
res = Runtime.PyNumber_TrueDivide(this.obj, ((PyObject)arg).obj);
11251125
break;
11261126
case ExpressionType.DivideAssign:
1127-
res = Runtime.PyNumber_InPlaceDivide(this.obj, ((PyObject)arg).obj);
1127+
res = Runtime.PyNumber_InPlaceTrueDivide(this.obj, ((PyObject)arg).obj);
11281128
break;
11291129
case ExpressionType.And:
11301130
res = Runtime.PyNumber_And(this.obj, ((PyObject)arg).obj);

‎src/runtime/runtime.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public static IntPtr GetProcAddress(IntPtr dllHandle, string name)
105105
public class Runtime
106106
{
107107
// C# compiler copies constants to the assemblies that references this library.
108-
// We needs to replace all public constants to static readonly fields to allow
108+
// We needs to replace all public constants to static readonly fields to allow
109109
// binary substitution of different Python.Runtime.dll builds in a target application.
110110

111111
public static int UCS => _UCS;
@@ -131,7 +131,7 @@ public class Runtime
131131
#endif
132132

133133
// C# compiler copies constants to the assemblies that references this library.
134-
// We needs to replace all public constants to static readonly fields to allow
134+
// We needs to replace all public constants to static readonly fields to allow
135135
// binary substitution of different Python.Runtime.dll builds in a target application.
136136

137137
public static string pyversion => _pyversion;
@@ -174,7 +174,7 @@ public class Runtime
174174
#endif
175175

176176
// C# compiler copies constants to the assemblies that references this library.
177-
// We needs to replace all public constants to static readonly fields to allow
177+
// We needs to replace all public constants to static readonly fields to allow
178178
// binary substitution of different Python.Runtime.dll builds in a target application.
179179

180180
public static readonly string PythonDLL = _PythonDll;
@@ -1188,7 +1188,7 @@ internal static bool PyFloat_Check(IntPtr ob)
11881188
internal static extern IntPtr PyNumber_Multiply(IntPtr o1, IntPtr o2);
11891189

11901190
[DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
1191-
internal static extern IntPtr PyNumber_Divide(IntPtr o1, IntPtr o2);
1191+
internal static extern IntPtr PyNumber_TrueDivide(IntPtr o1, IntPtr o2);
11921192

11931193
[DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
11941194
internal static extern IntPtr PyNumber_And(IntPtr o1, IntPtr o2);
@@ -1221,7 +1221,7 @@ internal static bool PyFloat_Check(IntPtr ob)
12211221
internal static extern IntPtr PyNumber_InPlaceMultiply(IntPtr o1, IntPtr o2);
12221222

12231223
[DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
1224-
internal static extern IntPtr PyNumber_InPlaceDivide(IntPtr o1, IntPtr o2);
1224+
internal static extern IntPtr PyNumber_InPlaceTrueDivide(IntPtr o1, IntPtr o2);
12251225

12261226
[DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
12271227
internal static extern IntPtr PyNumber_InPlaceAnd(IntPtr o1, IntPtr o2);

0 commit comments

Comments
 (0)