make repr of collections show appropriate subclass

To reflect the changes made in CPython 3.7 and make the test pass for
it.

Author: msimacek

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

@@ -311,6 +311,7 @@ def test_delitem():
     assert b == bytearray()
 
 
+@unittest.skipIf(sys.version_info.minor < 7, "Requires Python 3.7+")
 def test_subclass():
 
     class MyByteArray(bytearray):
@@ -321,7 +322,7 @@ def __str__(self):
     b1 = bytearray(range(10))
     b2 = MyByteArray(range(10))
     assert b1 == b2
-    assert "<<%s>>" % str(b1) == str(b2)
+    assert "<<%s>>" % str(b1).replace('bytearray', 'MyByteArray') == str(b2)
 
     class MyBytes(bytes):
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/array/ArrayBuiltins.java

@@ -54,6 +54,7 @@
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.GenNodeSupplier;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.GeneralizationNode;
+import com.oracle.graal.python.builtins.objects.type.TypeNodes;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.function.PythonBuiltinBaseNode;
 import com.oracle.graal.python.nodes.function.PythonBuiltinNode;
@@ -203,7 +204,12 @@ String str(PArray self) {
                 typeCode = "d";
                 array = Arrays.toString(((DoubleSequenceStorage) sequenceStorage).getInternalDoubleArray());
             }
-            return String.format("array('%s', %s)", typeCode, array);
+            String typeName = TypeNodes.GetNameNode.doSlowPath(self.getLazyPythonClass());
+            if (sequenceStorage.length() == 0) {
+                return String.format("%s('%s')", typeName, typeCode);
+            } else {
+                return String.format("%s('%s', %s)", typeName, typeCode, array);
+            }
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/ByteArrayBuiltins.java

@@ -44,7 +44,6 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__REPR__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__RMUL__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__SETITEM__;
-import static com.oracle.graal.python.nodes.SpecialMethodNames.__STR__;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.SystemError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.TypeError;
 import static com.oracle.graal.python.runtime.exception.PythonErrorType.ValueError;
@@ -65,6 +64,7 @@
 import com.oracle.graal.python.builtins.objects.range.PRange;
 import com.oracle.graal.python.builtins.objects.slice.PSlice;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
+import com.oracle.graal.python.builtins.objects.type.TypeNodes;
 import com.oracle.graal.python.nodes.SpecialMethodNames;
 import com.oracle.graal.python.nodes.call.special.LookupAndCallUnaryNode;
 import com.oracle.graal.python.nodes.control.GetIteratorExpressionNode.GetIteratorNode;
@@ -333,21 +333,13 @@ public Object mul(Object self, Object other) {
     public abstract static class RMulNode extends MulNode {
     }
 
-    @Builtin(name = __STR__, minNumOfPositionalArgs = 1)
-    @GenerateNodeFactory
-    public abstract static class StrNode extends PythonUnaryBuiltinNode {
-        @Specialization
-        public Object str(PByteArray self) {
-            return self.toString();
-        }
-    }
-
     @Builtin(name = __REPR__, minNumOfPositionalArgs = 1)
     @GenerateNodeFactory
     public abstract static class ReprNode extends PythonUnaryBuiltinNode {
         @Specialization
-        public Object repr(PByteArray self) {
-            return self.toString();
+        public Object repr(PByteArray self, @Cached("create()") TypeNodes.GetNameNode getNameNode) {
+            String typeName = getNameNode.execute(self.getLazyPythonClass());
+            return self.formatByteArray(typeName);
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/bytes/PByteArray.java

@@ -69,11 +69,16 @@ public final void setSequenceStorage(SequenceStorage store) {
     @Override
     @TruffleBoundary
     public String toString() {
-        if (store instanceof ByteSequenceStorage) {
-            byte[] barr = ((ByteSequenceStorage) store).getInternalByteArray();
-            return String.format("bytearray(%s)", BytesUtils.bytesRepr(barr, barr.length));
+        return formatByteArray("bytearray");
+    }
+
+    @TruffleBoundary
+    public String formatByteArray(String typeName) {
+        if (getSequenceStorage() instanceof ByteSequenceStorage) {
+            byte[] barr = ((ByteSequenceStorage) getSequenceStorage()).getInternalByteArray();
+            return String.format("%s(%s)", typeName, BytesUtils.bytesRepr(barr, barr.length));
         } else {
-            return String.format("bytearray(%s)", store);
+            return String.format("%s(%s)", typeName, getSequenceStorage());
         }
     }
 

graalpython/lib-graalpython/_collections.py

@@ -341,7 +341,7 @@ def __repr__(self):
             maxlen_repr = ''
         else:
             maxlen_repr = ', maxlen=%d' % (self.maxlen,)
-        return 'deque(%s%s)' % (list_repr, maxlen_repr)
+        return '%s(%s%s)' % (type(self).__name__, list_repr, maxlen_repr)
 
     def __compare__(self, other, op):
         if not isinstance(other, deque):

graalpython/lib-graalpython/itertools.py

@@ -38,6 +38,11 @@ def __next__(self):
                 self.step += 1
         return self.obj
 
+    def __repr__(self):
+        if self.times is not None:
+            return "{}({}, {})".format(type(self).__name__, self.obj, self.times)
+        return "{}({})".format(type(self).__name__, self.obj)
+
 
 class chain():
     """
@@ -120,7 +125,7 @@ def __next__(self):
         return _cnt
 
     def __repr__(self):
-        _repr = 'count({}'.format(self._cnt)
+        _repr = '{}({}'.format(type(self).__name__, self._cnt)
         if not isinstance(self._step, int) or self._step != 1:
             _repr += ', {}'.format(self._step)
         return _repr + ')'