Skip to content

Commit 50d2475

Browse files
committed
Improve getting interop exception message
1 parent b24e618 commit 50d2475

File tree

1 file changed

+14
-7
lines changed
  • graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception

1 file changed

+14
-7
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/exception/PBaseException.java

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -247,14 +247,21 @@ public String getFormattedMessage() {
247247
} else {
248248
return typeName;
249249
}
250-
} else if (args.getSequenceStorage().length() == 0) {
251-
return typeName;
252-
} else if (args.getSequenceStorage().length() == 1) {
253-
SequenceStorage store = args.getSequenceStorage();
254-
Object item = GetItemScalarNode.executeUncached(store, 0);
255-
return typeName + ": " + item.toString();
256250
} else {
257-
return typeName + ": " + args.toString();
251+
SequenceStorage storage = args.getSequenceStorage();
252+
if (storage.length() == 0) {
253+
return typeName;
254+
} else {
255+
StringBuilder builder = new StringBuilder(typeName);
256+
builder.append(": ");
257+
for (int i = 0; i < storage.length(); i++) {
258+
if (i > 0) {
259+
builder.append(", ");
260+
}
261+
builder.append(GetItemScalarNode.executeUncached(storage, i));
262+
}
263+
return builder.toString();
264+
}
258265
}
259266
}
260267

0 commit comments

Comments
 (0)