Sep 28, 2021 · Sep 27, 2021
diff --git a/src/embed_tests/pyimport.cs b/src/embed_tests/pyimport.cs
 using System;
 using System.IO;
 using System.Runtime.InteropServices;

 using NUnit.Framework;
 using Python.Runtime;

        public void BadAssembly()
        {
            string path;
            if (Python.Runtime.Runtime.IsWindows)
            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
            {
                path = @"C:\Windows\System32\kernel32.dll";
            }
            else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
            {
                path = "/usr/lib/libc.dylib";
            }
            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
            {
                path = "/usr/lib/locale/locale-archive";
            }
            else
            {
                Assert.Pass("TODO: add bad assembly location for other platforms");
 clr.AddReference('{path}')
 ";

            Assert.Throws<FileLoadException>(() => PythonEngine.Exec(code));
            Assert.Throws<BadImageFormatException>(() => PythonEngine.Exec(code));
        }
    }
 }
diff --git a/src/runtime/assemblymanager.cs b/src/runtime/assemblymanager.cs
            return LoadAssemblyPath(name.Name);
        }

        internal static AssemblyName? TryParseAssemblyName(string name)
        {
            try
            {
                return new AssemblyName(name);
            }
            catch (FileLoadException)
            {
                return null;
            }
        }


        /// <summary>
        /// We __really__ want to avoid using Python objects or APIs when

        /// <summary>
        /// Loads an assembly from the application directory or the GAC
        /// givena simple assembly name. Returns the assembly if loaded.
        /// givenits name. Returns the assembly if loaded.
        /// </summary>
        public static Assembly LoadAssembly(string name)
        public static Assembly LoadAssembly(AssemblyName name)
        {
            try
            {
                return Assembly.Load(name);
            }
            catch (FileNotFoundException)
            {
                return null;
            }
            return Assembly.Load(name);
        }


diff --git a/src/runtime/moduleobject.cs b/src/runtime/moduleobject.cs
            {
                assembly = AssemblyManager.LoadAssemblyPath(name);
            }
            if (assembly == null)
            if (assembly == null && AssemblyManager.TryParseAssemblyName(name) is { } parsedName)
            {
                assembly = AssemblyManager.LoadAssembly(name);
                assembly = AssemblyManager.LoadAssembly(parsedName);
            }
            if (assembly == null)
            {
Original file line number	Diff line number	Diff line change
		@@ -1,5 +1,7 @@
		using System;
		using System.IO;
		using System.Runtime.InteropServices;

		using NUnit.Framework;
		using Python.Runtime;

Expand DownExpand Up		@@ -83,10 +85,18 @@ public void TestCastGlobalVar()
		public void BadAssembly()
		{
		string path;
		if (Python.Runtime.Runtime.IsWindows)
		if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
		{
		path = @"C:\Windows\System32\kernel32.dll";
		}
		else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
		{
		path = "/usr/lib/libc.dylib";
		}
		else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
		{
		path = "/usr/lib/locale/locale-archive";
		}
		else
		{
		Assert.Pass("TODO: add bad assembly location for other platforms");
Expand All		@@ -98,7 +108,7 @@ import clr
		clr.AddReference('{path}')
		";

		Assert.Throws<FileLoadException>(() => PythonEngine.Exec(code));
		Assert.Throws<BadImageFormatException>(() => PythonEngine.Exec(code));
		}
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -121,6 +121,18 @@ private static Assembly ResolveHandler(object ob, ResolveEventArgs args)
		return LoadAssemblyPath(name.Name);
		}

		internal static AssemblyName? TryParseAssemblyName(string name)
		{
		try
		{
		return new AssemblyName(name);
		}
		catch (FileLoadException)
		{
		return null;
		}
		}


		/// <summary>
		/// We __really__ want to avoid using Python objects or APIs when
Expand DownExpand Up		@@ -208,18 +220,11 @@ static IEnumerable<string> FindAssemblyCandidates(string name)

		/// <summary>
		/// Loads an assembly from the application directory or the GAC
		/// givena simple assembly name. Returns the assembly if loaded.
		/// givenits name. Returns the assembly if loaded.
		/// </summary>
		public static Assembly LoadAssembly(string name)
		public static Assembly LoadAssembly(AssemblyName name)
		{
		try
		{
		return Assembly.Load(name);
		}
		catch (FileNotFoundException)
		{
		return null;
		}
		return Assembly.Load(name);
		}


Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -516,9 +516,9 @@ public static Assembly AddReference(string name)
		{
		assembly = AssemblyManager.LoadAssemblyPath(name);
		}
		if (assembly == null)
		if (assembly == null && AssemblyManager.TryParseAssemblyName(name) is { } parsedName)
		{
		assembly = AssemblyManager.LoadAssembly(name);
		assembly = AssemblyManager.LoadAssembly(parsedName);
		}
		if (assembly == null)
		{
Expand Down