Fix: consider '__module__' attribute in '__repr__' builtin.

Author: fangerer

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/Python3Core.java

@@ -425,6 +425,7 @@ public String[] builtinModuleNames() {
         return builtinModules.keySet().toArray(new String[0]);
     }
 
+    @Override
     public PythonModule getBuiltins() {
         return builtinsModule;
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/object/ObjectBuiltins.java

@@ -28,6 +28,8 @@
 
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__CLASS__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.__DICT__;
+import static com.oracle.graal.python.nodes.SpecialAttributeNames.__MODULE__;
+import static com.oracle.graal.python.nodes.SpecialAttributeNames.__QUALNAME__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.RICHCMP;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__BOOL__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__DELATTR__;
@@ -75,15 +77,13 @@
 import com.oracle.graal.python.nodes.function.builtins.PythonUnaryBuiltinNode;
 import com.oracle.graal.python.nodes.function.builtins.PythonVarargsBuiltinNode;
 import com.oracle.graal.python.nodes.object.GetClassNode;
-import com.oracle.graal.python.nodes.truffle.PythonArithmeticTypes;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.GenerateNodeFactory;
 import com.oracle.truffle.api.dsl.NodeFactory;
 import com.oracle.truffle.api.dsl.Specialization;
-import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.profiles.BranchProfile;
@@ -168,17 +168,24 @@ public Object str(Object self,
     }
 
     @Builtin(name = __REPR__, fixedNumOfPositionalArgs = 1)
-    @TypeSystemReference(PythonArithmeticTypes.class)
     @GenerateNodeFactory
     public abstract static class ReprNode extends PythonUnaryBuiltinNode {
         @Specialization
         @TruffleBoundary
         String repr(Object self,
-                        @Cached("create()") GetClassNode getClass) {
+                        @Cached("create()") GetClassNode getClass,
+                        @Cached("create()") ReadAttributeFromObjectNode readModuleNode,
+                        @Cached("create()") ReadAttributeFromObjectNode readQualNameNode) {
             if (self == PNone.NONE) {
                 return "None";
             }
-            return String.format("<%s object at 0x%x>", getClass.execute(self).getName(), self.hashCode());
+            PythonClass type = getClass.execute(self);
+            Object moduleName = readModuleNode.execute(type, __MODULE__);
+            Object qualName = readQualNameNode.execute(type, __QUALNAME__);
+            if (moduleName != PNone.NO_VALUE && !moduleName.equals(getCore().getBuiltins().getModuleName())) {
+                return String.format("<%s.%s object at 0x%x>", moduleName, qualName, self.hashCode());
+            }
+            return String.format("<%s object at 0x%x>", qualName, self.hashCode());
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeBuiltins.java

@@ -117,8 +117,8 @@ public String repr(PythonClass self,
         }
 
         @TruffleBoundary
-        private static String concat(Object moduleName, Object qualName) {
-            if (moduleName != PNone.NO_VALUE) {
+        private String concat(Object moduleName, Object qualName) {
+            if (moduleName != PNone.NO_VALUE && !moduleName.equals(getCore().getBuiltins().getModuleName())) {
                 return String.format("<class '%s.%s'>", moduleName, qualName);
             }
             return String.format("<class '%s'>", qualName);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonCore.java

@@ -115,6 +115,8 @@ public interface PythonCore {
 
     public PInt getFalse();
 
+    public PythonModule getBuiltins();
+
     static void writeWarning(String warning) {
         PythonLanguage.getLogger().warning(warning);
     }