[GR-12346] fix getting the class __module__ attr - for cases when the attr is not set

PullRequest: graalpython/262

Author: cosminbasca

graalpython/com.oracle.graal.python.test/src/tests/cpyext/test_object.py

@@ -38,7 +38,9 @@
 # SOFTWARE.
 
 import sys
+
 from . import CPyExtType, CPyExtTestCase, CPyExtFunction
+
 __dir__ = __file__.rpartition("/")[0]
 
 
@@ -145,6 +147,15 @@ def test_dict(self):
         tester.get_dict()["extra"] = "blah"
         assert tester.extra == "blah"
 
+    def test_repr(self):
+        TestRepr = CPyExtType("TestRepr", '')
+        tester = TestRepr()
+        try:
+            repr(tester)
+        except Exception:
+            assert False
+        assert True
+
 
 class TestObjectFunctions(CPyExtTestCase):
     def compile_module(self, name):

graalpython/com.oracle.graal.python.test/src/tests/test_repr.py

@@ -0,0 +1,68 @@
+# Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# The Universal Permissive License (UPL), Version 1.0
+#
+# Subject to the condition set forth below, permission is hereby granted to any
+# person obtaining a copy of this software, associated documentation and/or
+# data (collectively the "Software"), free of charge and under any and all
+# copyright rights in the Software, and any and all patent rights owned or
+# freely licensable by each licensor hereunder covering either (i) the
+# unmodified Software as contributed to or provided by such licensor, or (ii)
+# the Larger Works (as defined below), to deal in both
+#
+# (a) the Software, and
+#
+# (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+# one is included with the Software each a "Larger Work" to which the Software
+# is contributed by such licensors),
+#
+# without restriction, including without limitation the rights to copy, create
+# derivative works of, display, perform, and distribute the Software and make,
+# use, sell, offer for sale, import, export, have made, and have sold the
+# Software and the Larger Work(s), and to sublicense the foregoing rights on
+# either these or other terms.
+#
+# This license is subject to the following condition:
+#
+# The above copyright notice and either this complete permission notice or at a
+# minimum a reference to the UPL must be included in all copies or substantial
+# portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+def assert_not_raises(fnc, *args, **kwargs):
+    try:
+        fnc(*args, **kwargs)
+    except Exception:
+        assert False
+    assert True
+
+
+def test_repr_no_failures():
+    class MyClass(dict):
+        pass
+
+    x = 100
+
+    def a_func():
+        return 20 * x
+
+    assert_not_raises(lambda: repr([1, 2, 3]))
+    assert_not_raises(lambda: repr({1, 2, 3}))
+    assert_not_raises(lambda: repr(2))
+    assert_not_raises(lambda: repr(2.0))
+    assert_not_raises(lambda: repr(range(0, 10)))
+    assert_not_raises(lambda: repr(MyClass()))
+    assert_not_raises(lambda: repr(MyClass))
+    assert_not_raises(lambda: repr(None))
+    assert_not_raises(lambda: repr(a_func))
+    assert_not_raises(lambda: repr(object()))
+    assert_not_raises(lambda: repr(x))

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

@@ -111,9 +111,9 @@ public abstract static class ReprNode extends PythonUnaryBuiltinNode {
 
         @Specialization
         public String repr(PythonClass self,
-                        @Cached("create(__GETATTRIBUTE__)") LookupAndCallBinaryNode readModuleNode,
+                        @Cached("create()") ReadAttributeFromObjectNode readModuleNode,
                         @Cached("create(__GETATTRIBUTE__)") LookupAndCallBinaryNode readQualNameNode) {
-            Object moduleName = readModuleNode.executeObject(self, __MODULE__);
+            Object moduleName = readModuleNode.execute(self, __MODULE__);
             Object qualName = readQualNameNode.executeObject(self, __QUALNAME__);
             return concat(moduleName, qualName);
         }