From 3e9557e94f3d9250a8ed3f908ccaff9d57c18bb4 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Fri, 31 Jan 2014 15:38:49 -0800 Subject: [PATCH 1/2] Ignore generic types in the root namespace --- pythonnet/src/runtime/assemblymanager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pythonnet/src/runtime/assemblymanager.cs b/pythonnet/src/runtime/assemblymanager.cs index 80c838df2..5bbe2cb89 100644 --- a/pythonnet/src/runtime/assemblymanager.cs +++ b/pythonnet/src/runtime/assemblymanager.cs @@ -283,7 +283,7 @@ static void ScanAssembly(Assembly assembly) { namespaces[ns].Add(assembly, String.Empty); } - if (t.IsGenericTypeDefinition) { + if (ns!=null && t.IsGenericTypeDefinition) { GenericUtil.Register(t); } } From df5dee497a4a9f973bb586d6eb13d5235d667ff3 Mon Sep 17 00:00:00 2001 From: David Anthoff Date: Tue, 11 Feb 2014 09:42:34 -0800 Subject: [PATCH 2/2] Fix source code formatting --- pythonnet/src/runtime/assemblymanager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pythonnet/src/runtime/assemblymanager.cs b/pythonnet/src/runtime/assemblymanager.cs index 5bbe2cb89..3fc4a5feb 100644 --- a/pythonnet/src/runtime/assemblymanager.cs +++ b/pythonnet/src/runtime/assemblymanager.cs @@ -283,7 +283,7 @@ static void ScanAssembly(Assembly assembly) { namespaces[ns].Add(assembly, String.Empty); } - if (ns!=null && t.IsGenericTypeDefinition) { + if (ns != null && t.IsGenericTypeDefinition) { GenericUtil.Register(t); } }