Merge pull request #4 from davidanthoff/fixemptynamespace

davidanthoff · davidanthoff · commit 98264a3d1c57 · 2014-02-11T09:43:25.000-08:00
Ignore generic types in the root namespace
diff --git 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);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ static void ScanAssembly(Assembly assembly) {`
`283`	`283`	`namespaces[ns].Add(assembly, String.Empty);`
`284`	`284`	`}`
`285`	`285`
`286`		`- if (t.IsGenericTypeDefinition) {`
	`286`	`+ if (ns != null && t.IsGenericTypeDefinition) {`
`287`	`287`	`GenericUtil.Register(t);`
`288`	`288`	`}`
`289`	`289`	`}`