utils: Safer error formatting in parse_json/xml.

Resolves #440.
chrippa · Jul 12, 2014 · e4774d6 · e4774d6
1 parent 7a905d3
commit e4774d6
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/livestreamer/utils.py b/src/livestreamer/utils.py
@@ -52,8 +52,9 @@ def parse_json(data, name="JSON", exception=PluginError, schema=None):
     try:
         json_data = json.loads(data)
     except ValueError as err:
-        if len(data) > 35:
-            snippet = data[:35] + "..."
+        snippet = repr(data)
+        if len(snippet) > 35:
+            snippet = snippet[:35] + " ..."
         else:
             snippet = data
 
@@ -82,10 +83,9 @@ def parse_xml(data, name="XML", ignore_ns=False, exception=PluginError, schema=N
     try:
         tree = ET.fromstring(data)
     except Exception as err:
-        if len(data) > 35:
-            snippet = data[:35] + "..."
-        else:
-            snippet = data
+        snippet = repr(data)
+        if len(snippet) > 35:
+            snippet = snippet[:35] + " ..."
 
         raise exception("Unable to parse {0}: {1} ({2})".format(name, err, snippet))