Skip to content

Commit f2ddb69

Browse files
filmorfilmor
authored
Merge branch 'master' into compiler-warning
2 parents 0c6a7e2 + 1f26a51 commit f2ddb69

File tree

11 files changed

+20
-317
lines changed

11 files changed

+20
-317
lines changed

‎.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ python:
55
- 3.8
66
- 3.7
77
- 3.6
8-
- 3.5
98

109
env:
1110
matrix:

‎CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
1010
### Added
1111

1212
### Changed
13-
- Drop support for Python 2
13+
- Drop support for Python 2, 3.4, and 3.5
1414
- `clr.AddReference` may now throw errors besides `FileNotFoundException`, that provide more
1515
details about the cause of the failure
1616
- `clr.AddReference` no longer adds ".dll" implicitly
@@ -20,6 +20,7 @@ details about the cause of the failure
2020

2121
- Fix incorrect dereference of wrapper object in `tp_repr`, which may result in a program crash
2222
- Fix incorrect dereference in params array handling
23+
- Fix `object[]` parameters taking precedence when should not in overload resolution
2324

2425
## [2.5.0][] - 2020-06-14
2526

‎appveyor.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,9 @@ environment:
2121
BUILD_OPTS: --xplat
2222
- PYTHON_VERSION: 3.6
2323
BUILD_OPTS: --xplat
24-
- PYTHON_VERSION: 3.5
25-
BUILD_OPTS: --xplat
2624
- PYTHON_VERSION: 3.8
2725
- PYTHON_VERSION: 3.7
2826
- PYTHON_VERSION: 3.6
29-
- PYTHON_VERSION: 3.5
3027

3128
init:
3229
# Update Environment Variables based on matrix/platform

‎setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,6 @@ def run(self):
637637
"License :: OSI Approved :: MIT License",
638638
"Programming Language :: C#",
639639
"Programming Language :: Python :: 3",
640-
"Programming Language :: Python :: 3.5",
641640
"Programming Language :: Python :: 3.6",
642641
"Programming Language :: Python :: 3.7",
643642
"Programming Language :: Python :: 3.8",

‎src/runtime/Python.Runtime.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,6 @@
161161
<Compile Include="$(PythonInteropFile)" />
162162
</ItemGroup>
163163
<ItemGroup Condition=" '$(PythonInteropFile)' == '' ">
164-
<Compile Include="interop34.cs" />
165-
<Compile Include="interop35.cs" />
166164
<Compile Include="interop36.cs" />
167165
<Compile Include="interop37.cs" />
168166
<Compile Include="interop38.cs" />

‎src/runtime/interop34.cs

Lines changed: 0 additions & 144 deletions
This file was deleted.

‎src/runtime/interop35.cs

Lines changed: 0 additions & 149 deletions
This file was deleted.

‎src/runtime/methodbinder.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,16 @@ internal static int ArgPrecedence(Type t)
203203
return 3000;
204204
}
205205

206+
if (t.IsArray)
207+
{
208+
Type e = t.GetElementType();
209+
if (e == objectType)
210+
{
211+
return 2500;
212+
}
213+
return 100 + ArgPrecedence(e);
214+
}
215+
206216
TypeCode tc = Type.GetTypeCode(t);
207217
// TODO: Clean up
208218
switch (tc)
@@ -250,16 +260,6 @@ internal static int ArgPrecedence(Type t)
250260
return 40;
251261
}
252262

253-
if (t.IsArray)
254-
{
255-
Type e = t.GetElementType();
256-
if (e == objectType)
257-
{
258-
return 2500;
259-
}
260-
return 100 + ArgPrecedence(e);
261-
}
262-
263263
return 2000;
264264
}
265265

‎src/runtime/pybuffer.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,6 @@ public void ToContiguous(IntPtr buf, BufferOrderStyle order)
139139
{
140140
if (disposedValue)
141141
throw new ObjectDisposedException(nameof(PyBuffer));
142-
if (Runtime.PyVersion < new Version(3, 6))
143-
throw new NotSupportedException("ToContiguous requires at least Python 3.6");
144142

145143
if (Runtime.PyBuffer_ToContiguous(buf, ref _view, _view.len, OrderStyleToChar(order, true)) < 0)
146144
throw new PythonException();

0 commit comments

Comments
 (0)