py3k: __builtin__ module renamed to builtins, we should consider this to properly build ast for builtin objects

1 files changed, 4 insertions, 2 deletions

diff --git a/bases.py b/bases.py
index 499dd6b..1de9664 100644
--- a/bases.py
+++ b/bases.py
@@ -26,6 +26,8 @@ __docformat__ = "restructuredtext en"
 
 
 from logilab.common.compat import builtins
+
+from logilab.astng import BUILTINS_MODULE
 from logilab.astng.exceptions import InferenceError, ASTNGError, \
                                        NotFoundError, UnresolvableName
 from logilab.astng.as_string import as_string
@@ -242,7 +244,7 @@ class UnboundMethod(Proxy):
         # If we're unbound method __new__ of builtin object, the result is an
         # instance of the class given as first argument.
         if (self._proxied.name == '__new__' and
-                self._proxied.parent.frame().qname() == '__builtin__.object'):
+                self._proxied.parent.frame().qname() == '%s.object' % BUILTINS_MODULE):
             return (x is YES and x or Instance(x) for x in caller.args[0].infer())
         return self._proxied.infer_call_result(caller, context)
 
@@ -268,7 +270,7 @@ class Generator(Instance):
         return True
 
     def pytype(self):
-        return '__builtin__.generator'
+        return '%s.generator' % BUILTINS_MODULE
 
     def display_type(self):
         return 'Generator'