don't use __iter__ for list from string, this leads to an endless recursion

timfel · timfel · commit 0b9b7179c047 · 2018-08-02T09:51:59.000+02:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/builtins/ListNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/builtins/ListNodes.java
@@ -320,7 +320,7 @@ public PList listIterable(PythonClass cls, @SuppressWarnings("unused") PNone non
             return factory().createList(cls);
         }
 
-        @Specialization(guards = "!isNoValue(iterable)")
+        @Specialization(guards = {"!isNoValue(iterable)", "!isString(iterable)"})
         public PList listIterable(PythonClass cls, Object iterable, @SuppressWarnings("unused") PythonClass valueClass,
                         @Cached("create()") GetIteratorNode getIteratorNode,
                         @Cached("create()") CreateListFromIteratorNode createListFromIteratorNode) {

Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,7 @@ public PList listIterable(PythonClass cls, @SuppressWarnings("unused") PNone non`
`320`	`320`	`return factory().createList(cls);`
`321`	`321`	`}`
`322`	`322`
`323`		`- @Specialization(guards = "!isNoValue(iterable)")`
	`323`	`+ @Specialization(guards = {"!isNoValue(iterable)", "!isString(iterable)"})`
`324`	`324`	`public PList listIterable(PythonClass cls, Object iterable, @SuppressWarnings("unused") PythonClass valueClass,`
`325`	`325`	`@Cached("create()") GetIteratorNode getIteratorNode,`
`326`	`326`	`@Cached("create()") CreateListFromIteratorNode createListFromIteratorNode) {`