improved docstrings, removed extra calls.

Author: bialix

intelhex/__init__.py

@@ -338,22 +338,17 @@ def tobinarray(self, start=None, end=None, pad=_DEPRECATED, size=None):
         return self._tobinarray_really(start, end, pad, size)
 
     def _tobinarray_really(self, start, end, pad, size):
+        """Return binary array."""
         if pad is None:
             pad = self.padding
-
         bin = array('B')
-
         if self._buf == {} and None in (start, end):
             return bin
-
         if size is not None and size <= 0:
             raise ValueError("tobinarray: wrong value for size")
-
         start, end = self._get_start_end(start, end, size)
-
         for i in range_g(start, end+1):
             bin.append(self._buf.get(i, pad))
-
         return bin
 
     def tobinstr(self, start=None, end=None, pad=_DEPRECATED, size=None):
@@ -364,7 +359,7 @@ def tobinstr(self, start=None, end=None, pad=_DEPRECATED, size=None):
                         fill empty spaces with this value
                         (if pad is None then this method uses self.padding).
         @param  size    size of the block, used with start or end parameter.
-        @return         string of binary data.
+        @return         bytes string of binary data.
         '''
         if not isinstance(pad, _DeprecatedParam):
             print ("IntelHex.tobinstr: 'pad' parameter is deprecated.")
@@ -711,7 +706,8 @@ def tofile(self, fobj, format):
     def gets(self, addr, length):
         """Get string of bytes from given address. If any entries are blank
         from addr through addr+length, a NotEnoughDataError exception will
-        be raised. Padding is not used."""
+        be raised. Padding is not used.
+        """
         a = array('B', asbytes('\0'*length))
         try:
             for i in range_g(length):
@@ -729,7 +725,7 @@ def puts(self, addr, s):
             self._buf[addr+i] = a[i]
 
     def getsz(self, addr):
-        """Get zero-terminated string from given address. Will raise 
+        """Get zero-terminated bytes string from given address. Will raise 
         NotEnoughDataError exception if a hole is encountered before a 0.
         """
         i = 0
@@ -744,7 +740,7 @@ def getsz(self, addr):
         return self.gets(addr, i)
 
     def putsz(self, addr, s):
-        """Put string in object at addr and append terminating zero at end."""
+        """Put bytes string in object at addr and append terminating zero at end."""
         self.puts(addr, s)
         self._buf[addr+len(s)] = 0
 

intelhex/test.py

@@ -494,7 +494,7 @@ def test_tobinarray_with_size(self):
     def test_tobinstr(self):
         ih = IntelHex(self.f)
         s1 = ih.tobinstr()
-        s2 = asbytes(array_tobytes(bin8))
+        s2 = array_tobytes(bin8)
         self.assertEqual(s2, s1, "data not equal\n%s\n\n%s" % (s1, s2))
 
     def test_tobinfile(self):
@@ -503,14 +503,14 @@ def test_tobinfile(self):
         ih.tobinfile(sio)
         s1 = sio.getvalue()
         sio.close()
-        s2 = asbytes(array_tobytes(bin8))
+        s2 = array_tobytes(bin8)
         self.assertEqual(s2, s1, "data not equal\n%s\n\n%s" % (s1, s2))
         # new API: .tofile universal method
         sio = BytesIO()
         ih.tofile(sio, format='bin')
         s1 = sio.getvalue()
         sio.close()
-        s2 = asbytes(array_tobytes(bin8))
+        s2 = array_tobytes(bin8)
         self.assertEqual(s2, s1, "data not equal\n%s\n\n%s" % (s1, s2))
 
     def test_tobinfile_realfile(self):