Merge pull request #85 from chapmanb/debug-fixes

Improve debugging: missing filename and bad lists

Author: mr-c

schema_salad/sourceline.py

@@ -150,13 +150,13 @@ def makeError(self, msg):  # type: (Text) -> Any
             return self.raise_type(msg)
         errs = []
         if self.key is None or self.item.lc.data is None or self.key not in self.item.lc.data:
-            lead = "%s:%i:%i:" % (self.item.lc.filename,
-                                  self.item.lc.line+1,
-                                  self.item.lc.col+1)
+            lead = "%s:%i:%i:" % (self.item.lc.filename if hasattr(self.item.lc, "filename") else "",
+                                  (self.item.lc.line or 0)+1,
+                                  (self.item.lc.col or 0)+1)
         else:
-            lead = "%s:%i:%i:" % (self.item.lc.filename,
-                                  self.item.lc.data[self.key][0]+1,
-                                  self.item.lc.data[self.key][1]+1)
+            lead = "%s:%i:%i:" % (self.item.lc.filename if hasattr(self.item.lc, "filename") else "",
+                                  (self.item.lc.data[self.key][0] or 0)+1,
+                                  (self.item.lc.data[self.key][1] or 0)+1)
         for m in msg.splitlines():
             if lineno_re.match(m):
                 errs.append(m)

schema_salad/validate.py

@@ -180,8 +180,8 @@ def validate_ex(expected_schema,            # type: Schema
             return True
         else:
             if raise_ex:
-                raise ValidationException(u"the value is not a list, expected list of %s" % (
-                    friendly(expected_schema.items)))
+                raise ValidationException(u"the value %s is not a list, expected list of %s" % (
+                    vpformat(datum), friendly(expected_schema.items)))
             else:
                 return False
     elif isinstance(expected_schema, avro.schema.UnionSchema):