From: Craig Citro <craigcitro@gmail.com>
Date: Wed, 7 Jul 2010 07:20:50 +0000 (-0700)
Subject: Correctly resolve imports of modules already cimported.
X-Git-Tag: 0.13.beta0~31
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b091fe6559221dd92672e082ab7b9564f36825e0;p=cython.git

Correctly resolve imports of modules already cimported.
---

diff --git a/Cython/Compiler/Nodes.py b/Cython/Compiler/Nodes.py
index 0f9c3e43..55b57562 100644
--- a/Cython/Compiler/Nodes.py
+++ b/Cython/Compiler/Nodes.py
@@ -4988,17 +4988,26 @@ class FromImportStatNode(StatNode):
                         break
             else:
                 entry =  env.lookup(target.name)
-                if (entry.is_type and 
-                    entry.type.name == name and
-                    entry.type.module_name == self.module.module_name.value):
-                    continue # already cimported
+                # check whether or not entry is already cimported
+                if (entry.is_type and entry.type.name == name
+                    and hasattr(entry.type, 'module_name')):
+                    if entry.type.module_name == self.module.module_name.value:
+                        # cimported with absolute name
+                        continue
+                    try:
+                        # cimported with relative name
+                        module = env.find_module(self.module.module_name.value,
+                                                 pos=None)
+                        if entry.type.module_name == module.qualified_name:
+                            continue
+                    except AttributeError:
+                        pass 
                 target.analyse_target_expression(env, None)
                 if target.type is py_object_type:
                     coerced_item = None
                 else:
                     coerced_item = self.item.coerce_to(target.type, env)
-                self.interned_items.append(
-                    (name, target, coerced_item))
+                self.interned_items.append((name, target, coerced_item))
     
     def generate_execution_code(self, code):
         self.module.generate_evaluation_code(code)