Skip to content

resolve https://github.com/pythonnet/pythonnet/issues/98 #106

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
tonyroberts merged 1 commit into from
Oct 12, 2015
Merged

resolve https://github.com/pythonnet/pythonnet/issues/98 #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 18 additions & 0 deletions src/runtime/assemblymanager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,24 @@ public static Assembly LoadAssemblyPath(string name) {
return assembly;
}

/// <summary>
/// Loads an assembly using full path.
/// </summary>
/// <param name="name"></param>
/// <returns></returns>
public static Assembly LoadAssemblyFullPath(string name) {
Assembly assembly = null;
if (Path.IsPathRooted(name)) {
if (!Path.HasExtension(name))
name = name + ".dll";
if (File.Exists(name)) {
try { assembly = Assembly.LoadFrom(name); }
catch { }
}
}
return assembly;
}

//===================================================================
// Returns an assembly that's already been loaded
//===================================================================
Expand Down
4 changes: 4 additions & 0 deletions src/runtime/moduleobject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,11 +409,15 @@ public static Assembly AddReference(string name)
{
assembly = AssemblyManager.LoadAssembly(name);
}
if (assembly == null) {
assembly = AssemblyManager.LoadAssemblyFullPath(name);
}
if (assembly == null)
{
string msg = String.Format("Unable to find assembly '{0}'.", name);
throw new System.IO.FileNotFoundException(msg);
}

return assembly ;
}

Expand Down