CR changes

Author: roxanneskelly

llsd/base.py

@@ -317,7 +317,7 @@ def _array_to_python(node, depth=0):
 def _to_python(node, depth=0):
     "Convert node to a python object."
     if depth > MAX_PARSE_DEPTH:
-        raise LLSDParseError("Cannot serialize depth of more than %d" % MAX_FORMAT_DEPTH)
+        raise LLSDSerializationError("Cannot serialize depth of more than %d" % MAX_FORMAT_DEPTH)
 
     return NODE_HANDLERS[node.tag](node, depth)
 

llsd/serde_binary.py

@@ -83,7 +83,7 @@ def parse(self, something, ignore_binary = False):
     def _parse(self):
         "The actual parser which is called recursively when necessary."
         if self._depth > MAX_PARSE_DEPTH:
-            self._error("Parse depth exceeded max.")
+            self._error("Parse depth exceeded maximum depth of %d." % MAX_PARSE_DEPTH)
 
         cc = self._getc()
         try:
@@ -100,7 +100,7 @@ def _parse_map(self):
         count = 0
         cc = self._getc()
         key = b''
-        self._depth = self._depth + 1
+        self._depth += 1
         while (cc != b'}') and (count < size):
             if cc == b'k':
                 key = self._parse_string()
@@ -114,7 +114,7 @@ def _parse_map(self):
             cc = self._getc()
         if cc != b'}':
             self._error("invalid map close token")
-        self._depth = self._depth - 1
+        self._depth -= 1
         return rv
 
     def _parse_array(self):

llsd/serde_notation.py

@@ -109,7 +109,7 @@ def _get_until(self, delim):
     def _parse(self, cc):
         "The notation parser workhorse."
         if self._depth > MAX_PARSE_DEPTH:
-            self._error("Parse depth exceeded max.")
+            self._error("Parse depth exceeded max of %d" % MAX_PARSE_DEPTH)
         try:
             func = self._dispatch[ord(cc)]
         except IndexError:

llsd/serde_xml.py

@@ -69,12 +69,12 @@ class LLSDXMLFormatter(LLSDBaseFormatter):
     interface to this functionality.
     """
 
-    def __init__(self, indent_atom = None):
+    def __init__(self, indent_atom = b'', eol = b''):
         "Construct a serializer."
         # Call the super class constructor so that we have the type map
         super(LLSDXMLFormatter, self).__init__()
-        self._indent_atom = b''
-        self._eol = b''
+        self._indent_atom = indent_atom
+        self._eol = eol
         self._depth = 1
 
     def _indent(self):
@@ -178,14 +178,10 @@ class LLSDXMLPrettyFormatter(LLSDXMLFormatter):
     This class is not necessarily suited for serializing very large objects.
     It sorts on dict (llsd map) keys alphabetically to ease human reading.
     """
-    def __init__(self, indent_atom = b'  '):
+    def __init__(self, indent_atom = b'  ', eol = b'\n'):
         "Construct a pretty serializer."
         # Call the super class constructor so that we have the type map
-        super(LLSDXMLPrettyFormatter, self).__init__()
-
-        # Private data used for indentation.
-        self._indent_atom = indent_atom
-        self._eol = b'\n'
+        super(LLSDXMLPrettyFormatter, self).__init__(indent_atom = indent_atom, eol = eol)
 
     def _indent(self):
         "Write an indentation based on the atom and indentation level."

tests/llsd_test.py

@@ -16,7 +16,7 @@
 import pytest
 
 import llsd
-from llsd.base import PY2, is_integer, is_string, is_unicode
+from llsd.base import PY2, is_integer, is_string, is_unicode, MAX_FORMAT_DEPTH, MAX_PARSE_DEPTH
 from llsd.serde_xml import remove_invalid_xml_bytes
 from tests.fuzz import LLSDFuzzer
 
@@ -533,7 +533,7 @@ def testDeepMap(self):
         """
 
         test_map = {"foo":"bar", "depth":0}
-        max_depth = 199
+        max_depth = MAX_FORMAT_DEPTH - 1
         for depth in range(max_depth):
             test_map = {"foo":"bar", "depth":depth, "next":test_map}
 
@@ -990,7 +990,7 @@ def testDeepMap(self):
         """
 
         test_map = {"foo":"bar", "depth":0}
-        max_depth = 199
+        max_depth = MAX_FORMAT_DEPTH -1
         for depth in range(max_depth):
             test_map = {"foo":"bar", "depth":depth, "next":test_map}
 
@@ -1525,7 +1525,7 @@ def testDeepMap(self):
         """
 
         test_map = {"foo":"bar", "depth":0}
-        max_depth = 199
+        max_depth = MAX_FORMAT_DEPTH - 1
         for depth in range(max_depth):
             test_map = {"foo":"bar", "depth":depth, "next":test_map}