py2: amari.xlog: Accept both str and unicode for "expected to be string" entries

json might decode them as unicode.

py2: amari.xlog: Accept both str and unicode for "expected to be string" entries
json might decode them as unicode.
372ed2d0 · Kirill Smelkov · b00073fe · 372ed2d0
Commit 372ed2d0 authored Mar 27, 2023 by Kirill Smelkov
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

amari/xlog.py amari/xlog.py +4 -0

No files found.
--- a/amari/xlog.py
+++ b/amari/xlog.py
@@ -676,6 +676,10 @@ def get1(xd, key, typeok):
    if key not in xd:
        raise ParseError("%s:%d/%s no `%s`" %
                            (xd.pos[0], xd.pos[1], '/'.join(xd.path), key))
+    # py2
+    if typeok == str:
+        typeok = (str, unicode)
+
    val = xd[key]
    if not isinstance(val, typeok):
        raise ParseError("%s:%d/%s : got %s  ; expected `%s`" %