Jul 17, 2024 · Jul 18, 2024 · Jul 18, 2024 · Jul 18, 2024 · Jul 18, 2024 · Jul 18, 2024
diff --git a/AUTHORS.md b/AUTHORS.md
 -   Jan Krivanek ([@jakrivan](https://github.com/jakrivan))
 -   Jeff Reback ([@jreback](https://github.com/jreback))
 -   Jeff Robbins ([@jeff17robbins](https://github.com/jeff17robbins))
 -   João Neves ([@joaompneves](https://github.com/joaompneves))
 -   Joe Frayne ([@jfrayne](https://github.com/jfrayne))
 -   Joe Lidbetter ([@jmlidbetter](https://github.com/jmlidbetter))
 -   Joe Savage ([@s4v4g3](https://github.com/s4v4g3))
diff --git a/CHANGELOG.md b/CHANGELOG.md

 ### Added

 -   Added `ToPythonAs()` extension method to allow for explicit conversion using a specific type not known at build time. ([#2419][i2419])

 -   Added `ToPythonAs<T>()` extension method to allow for explicit conversion using a specific type. ([#2311][i2311])

 -   Added `IComparable` and `IEquatable` implementations to `PyInt`, `PyFloat`, and `PyString`
diff --git a/src/embed_tests/Codecs.cs b/src/embed_tests/Codecs.cs
            Assert.AreEqual(TestExceptionMessage, error.Message);
        }

        [Test(Description = "Tests encoding of an object that explicitly implements an interface.")]
        public void ExplicitObjectInterfaceEncoded()
        {
            var obj = new ExplicitInterfaceObject();
            using var scope = Py.CreateScope();
            scope.Exec(@"
 def call(obj):
  return dir(obj)
 ");
            var callFunc = scope.Get("call");
            // explicitly pass an interface (but not a generic type argument) to simulate a scenario where the type is not know at build time
            var callArg = obj.ToPythonAs(typeof(IObjectInterface));
            var members = callFunc.Invoke(callArg).As<string[]>();
            CollectionAssert.Contains(members, nameof(IObjectInterface.MemberFromInterface));
            CollectionAssert.DoesNotContain(members, nameof(ExplicitInterfaceObject.MemberFromObject));
        }

        [Test]
        public void DateTimeDecoded()
        {
            return true;
        }
    }

    interface IObjectInterface
    {
        int MemberFromInterface { get; }
    }

    class ExplicitInterfaceObject : IObjectInterface
    {
        int IObjectInterface.MemberFromInterface { get; }

        public int MemberFromObject { get; }
    }
 }
diff --git a/src/embed_tests/Python.EmbeddingTest.csproj b/src/embed_tests/Python.EmbeddingTest.csproj

  <PropertyGroup>
    <TargetFrameworks>net472;net6.0</TargetFrameworks>
    <RollForward>LatestMajor</RollForward>
    <AssemblyOriginatorKeyFile>..\pythonnet.snk</AssemblyOriginatorKeyFile>
    <SignAssembly>true</SignAssembly>
  </PropertyGroup>
diff --git a/src/runtime/Converter.cs b/src/runtime/Converter.cs
        }

        public static PyObject ToPythonAs<T>(this T? o)
        {
            return ToPythonAs(o, typeof(T));
        }

        public static PyObject ToPythonAs(this object? o, Type type)
        {
            if (o is null) return Runtime.None;
            return Converter.ToPython(o,typeof(T)).MoveToPyObject();
            return Converter.ToPython(o,type).MoveToPyObject();
        }
    }
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -44,6 +44,7 @@
		- Jan Krivanek ([@jakrivan](https://github.com/jakrivan))
		- Jeff Reback ([@jreback](https://github.com/jreback))
		- Jeff Robbins ([@jeff17robbins](https://github.com/jeff17robbins))
		- João Neves ([@joaompneves](https://github.com/joaompneves))
		- Joe Frayne ([@jfrayne](https://github.com/jfrayne))
		- Joe Lidbetter ([@jmlidbetter](https://github.com/jmlidbetter))
		- Joe Savage ([@s4v4g3](https://github.com/s4v4g3))
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,6 +9,8 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].

		### Added

		- Added `ToPythonAs()` extension method to allow for explicit conversion using a specific type not known at build time. ([#2419][i2419])

		- Added `ToPythonAs<T>()` extension method to allow for explicit conversion using a specific type. ([#2311][i2311])

		- Added `IComparable` and `IEquatable` implementations to `PyInt`, `PyFloat`, and `PyString`
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -339,6 +339,23 @@ public void ExceptionDecoded()
		Assert.AreEqual(TestExceptionMessage, error.Message);
		}

		[Test(Description = "Tests encoding of an object that explicitly implements an interface.")]
		public void ExplicitObjectInterfaceEncoded()
		{
		var obj = new ExplicitInterfaceObject();
		using var scope = Py.CreateScope();
		scope.Exec(@"
		def call(obj):
		return dir(obj)
		");
		var callFunc = scope.Get("call");
		// explicitly pass an interface (but not a generic type argument) to simulate a scenario where the type is not know at build time
		var callArg = obj.ToPythonAs(typeof(IObjectInterface));
		var members = callFunc.Invoke(callArg).As<string[]>();
		CollectionAssert.Contains(members, nameof(IObjectInterface.MemberFromInterface));
		CollectionAssert.DoesNotContain(members, nameof(ExplicitInterfaceObject.MemberFromObject));
		}

		[Test]
		public void DateTimeDecoded()
		{
Expand DownExpand Up		@@ -533,4 +550,16 @@ public bool TryDecode<T>(PyObject pyObj, out T value)
		return true;
		}
		}

		interface IObjectInterface
		{
		int MemberFromInterface { get; }
		}

		class ExplicitInterfaceObject : IObjectInterface
		{
		int IObjectInterface.MemberFromInterface { get; }

		public int MemberFromObject { get; }
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,6 +2,7 @@

		<PropertyGroup>
		<TargetFrameworks>net472;net6.0</TargetFrameworks>
		<RollForward>LatestMajor</RollForward>
Copy link Author joaompnevesJul 18, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. This allows anyone that has recent versions of .net to run these tests. I can revert but I think its usefull, otherwise one needs to install .net6 which is already deprecated Copy link Member lostmsuJul 22, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. I think this should be conditioned on not running in CI Copy link Author joaompnevesJul 23, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Is there any config/env var which I can check?
		<AssemblyOriginatorKeyFile>..\pythonnet.snk</AssemblyOriginatorKeyFile>
		<SignAssembly>true</SignAssembly>
		</PropertyGroup>
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -983,9 +983,14 @@ public static PyObject ToPython(this object? o)
		}

		public static PyObject ToPythonAs<T>(this T? o)
		{
		return ToPythonAs(o, typeof(T));
		}

		public static PyObject ToPythonAs(this object? o, Type type)
		{
		if (o is null) return Runtime.None;
		return Converter.ToPython(o,typeof(T)).MoveToPyObject();
		return Converter.ToPython(o,type).MoveToPyObject();
		}
joaompneves marked this conversation as resolved. Show resolvedHide resolved
		}
		}