Commit 2096862e authored by Stefan Behnel's avatar Stefan Behnel

merge

parents 47fee73f 9b11884b
...@@ -3610,7 +3610,7 @@ class CImportStatNode(StatNode): ...@@ -3610,7 +3610,7 @@ class CImportStatNode(StatNode):
return return
module_scope = env.find_module(self.module_name, self.pos) module_scope = env.find_module(self.module_name, self.pos)
if "." in self.module_name: if "." in self.module_name:
names = self.module_name.split(".") names = [EncodedString(name) for name in self.module_name.split(".")]
top_name = names[0] top_name = names[0]
top_module_scope = env.context.find_submodule(top_name) top_module_scope = env.context.find_submodule(top_name)
module_scope = top_module_scope module_scope = top_module_scope
......
...@@ -1263,7 +1263,7 @@ class CClassScope(ClassScope): ...@@ -1263,7 +1263,7 @@ class CClassScope(ClassScope):
if name == "__new__": if name == "__new__":
warning(pos, "__new__ method of extension type will change semantics " warning(pos, "__new__ method of extension type will change semantics "
"in a future version of Pyrex and Cython. Use __cinit__ instead.") "in a future version of Pyrex and Cython. Use __cinit__ instead.")
name = "__cinit__" name = Utils.EncodedString("__cinit__")
entry = self.declare_var(name, py_object_type, pos) entry = self.declare_var(name, py_object_type, pos)
special_sig = get_special_method_signature(name) special_sig = get_special_method_signature(name)
if special_sig: if special_sig:
...@@ -1280,7 +1280,7 @@ class CClassScope(ClassScope): ...@@ -1280,7 +1280,7 @@ class CClassScope(ClassScope):
def lookup_here(self, name): def lookup_here(self, name):
if name == "__new__": if name == "__new__":
name = "__cinit__" name = Utils.EncodedString("__cinit__")
return ClassScope.lookup_here(self, name) return ClassScope.lookup_here(self, name)
def declare_cfunction(self, name, type, pos, def declare_cfunction(self, name, type, pos,
......
cimport dotted_cimport_submodule.a
import dotted_cimport_submodule.b
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment