Skip to content

remove remoting block for .NET standard #1170

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.

Sign up for GitHub

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
lostmsu merged 2 commits into from
Jun 24, 2020
Merged

remove remoting block for .NET standard #1170

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1df75ea
remove remoting
koubaa Jun 23, 2020
82bdb9a
reflection-based remoting support
koubaa Jun 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
reflection-based remoting support
  • Loading branch information
@koubaa
koubaa committed Jun 24, 2020
commit 82bdb9ab8f8c91c6e6edcc99bbd0369c273b404d
1 change: 0 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ This version improves performance on benchmarks significantly compared to 2.3.
`Obsolete`, should never have been `public` in the first place. They also
don't necessarily return a result that matches the `platform` module's.
- Unconditionally depend on `pycparser` for the interop module generation
- Removed .NET remoting support

### Fixed

Expand Down
20 changes: 19 additions & 1 deletion src/runtime/converter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,23 @@ internal static IntPtr ToPython<T>(T value)
return ToPython(value, typeof(T));
}

private static readonly Func<object, bool> IsTransparentProxy = GetIsTransparentProxy();

private static bool Never(object _) => false;

private static Func<object, bool> GetIsTransparentProxy()
{
var remoting = typeof(int).Assembly.GetType("System.Runtime.Remoting.RemotingServices");
if (remoting is null) return Never;

var isProxy = remoting.GetMethod("IsTransparentProxy", new[] { typeof(object) });
if (isProxy is null) return Never;

return (Func<object, bool>)Delegate.CreateDelegate(
typeof(Func<object, bool>), isProxy,
throwOnBindFailure: true);
}

internal static IntPtr ToPython(object value, Type type)
{
if (value is PyObject)
Expand Down Expand Up @@ -162,7 +179,8 @@ internal static IntPtr ToPython(object value, Type type)
var pyderived = value as IPythonDerivedType;
if (null != pyderived)
{
return ClassDerivedObject.ToPython(pyderived);
if (!IsTransparentProxy(pyderived))
return ClassDerivedObject.ToPython(pyderived);
}

// hmm - from Python, we almost never care what the declared
Expand Down