@@ -190,10 +190,17 @@ public void LoadNames()
             foreach (string name in AssemblyManager.GetNames(_namespace))
             {
                 cache.TryGetValue(name, out m);
-                if (m == null)
+                if (m != null)
                 {
-                    ManagedType attr = GetAttribute(name, true);
+                    continue;
                 }
+                IntPtr attr = Runtime.PyDict_GetItemString(dict, name);
+                // If __dict__ has already set a custom property, skip it.
+                if (attr != IntPtr.Zero)
+                {
+                    continue;
+                }
+                GetAttribute(name, true);
             }
         }
 
 
@@ -14,7 +14,7 @@ def test_relative_missing_import():
 
 
 def test_import_all_on_second_time():
-    """Test import all attributes after a normal.
+    """Test import all attributes after a normal import without '*'.
     Due to import * only allowed at module level, the test body splited
     to a module file."""
     from . import importtest
Original file line number	Diff line number	Diff line change
@@ -190,10 +190,17 @@ public void LoadNames()
190	190	foreach (string name in AssemblyManager.GetNames(_namespace))
191	191	{
192	192	cache.TryGetValue(name, out m);
193		- if (m == null)
	193	+ if (m != null)
194	194	{
195		- ManagedType attr = GetAttribute(name, true);
	195	+ continue;
196	196	}
	197	+ IntPtr attr = Runtime.PyDict_GetItemString(dict, name);
	198	+ // If __dict__ has already set a custom property, skip it.
	199	+ if (attr != IntPtr.Zero)
	200	+ {
	201	+ continue;
	202	+ }
	203	+ GetAttribute(name, true);
197	204	}
198	205	}
199	206