CR fixes

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 LLSDSerializationError("Cannot serialize depth of more than %d" % MAX_FORMAT_DEPTH)
+        raise LLSDParseError("Cannot parse depth of more than %d" % MAX_FORMAT_DEPTH)
 
     return NODE_HANDLERS[node.tag](node, depth)
 

llsd/serde_binary.py

@@ -120,13 +120,13 @@ def _parse_map(self):
     def _parse_array(self):
         "Parse a single llsd array"
         rv = []
-        self._depth = self._depth + 1
+        self._depth += 1
         size = struct.unpack("!i", self._getc(4))[0]
         for count in range(size):
             rv.append(self._parse())
         if self._getc() != b']':
             self._error("invalid array close token")
-        self._depth = self._depth - 1
+        self._depth -= 1
         return rv
 
     def _parse_string(self):

llsd/serde_notation.py

@@ -185,7 +185,7 @@ def _parse_map(self, cc):
         rv = {}
         key = b''
         found_key = False
-        self._depth = self._depth + 1
+        self._depth += 1
         # skip the beginning '{'
         cc = self._getc()
         while (cc != b'}'):
@@ -211,7 +211,7 @@ def _parse_map(self, cc):
             else:
                 self._error("missing separator")
             cc = self._getc()
-        self._depth = self._depth - 1
+        self._depth -= 1
 
         return rv
 
@@ -222,7 +222,7 @@ def _parse_array(self, cc):
         array: [ object, object, object ]
         """
         rv = []
-        self._depth = self._depth + 1
+        self._depth += 1
         # skip the beginning '['
         cc = self._getc()
         while (cc != b']'):
@@ -233,7 +233,7 @@ def _parse_array(self, cc):
                 continue
             rv.append(self._parse(cc))
             cc = self._getc()
-        self._depth = self._depth - 1
+        self._depth -= 1
         return rv
 
     def _parse_uuid(self, cc):
@@ -454,22 +454,22 @@ def _DATE(self, v):
     def _ARRAY(self, v):
         self.stream.write(b'[')
         delim = b''
-        self._depth = self._depth + 1
+        self._depth += 1
         for item in v:
             self.stream.write(delim)
             self._generate(item)
             delim = b','
-        self._depth = self._depth - 1
+        self._depth -= 1
         self.stream.write(b']')
     def _MAP(self, v):
         self.stream.write(b'{')
         delim = b''
-        self._depth = self._depth + 1
+        self._depth += 1
         for key, value in v.items():
             self.stream.writelines([delim, b"'", self._esc(UnicodeType(key)), b"':"])
             self._generate(value)
             delim = b','
-        self._depth = self._depth - 1
+        self._depth -= 1
         self.stream.write(b'}')
 
     def _esc(self, data, quote=b"'"):

llsd/serde_xml.py

@@ -114,15 +114,15 @@ def _DATE(self, v):
         self.stream.writelines([b'<date>', _format_datestr(v), b'</date>', self._eol])
     def _ARRAY(self, v):
         self.stream.writelines([b'<array>', self._eol])
-        self._depth = self._depth + 1
+        self._depth += 1
         for item in v:
             self._indent()
             self._generate(item)
-        self._depth = self._depth - 1
+        self._depth -= 1
         self.stream.writelines([b'</array>', self._eol])
     def _MAP(self, v):
         self.stream.writelines([b'<map>', self._eol])
-        self._depth = self._depth + 1
+        self._depth += 1
         for key, value in v.items():
             self._indent()
             if PY2:     # pragma: no cover
@@ -137,7 +137,7 @@ def _MAP(self, v):
                                         self._eol])
             self._indent()
             self._generate(value)
-        self._depth = self._depth - 1
+        self._depth -= 1
         self._indent()
         self.stream.writelines([b'</map>', self._eol])