Changeset 4556

Timestamp:

04/22/09 21:25:43 (4 years ago)

Author:

getxsick

Message:

#303 fixed.
added optional argument 'chunk_amount' for split_number_into_chunks() function.
this argument set expected number of chunks. if a value is lower than minimum
needed of chunks, then UMPAException is raised.

also, added extra tests for this.

Location:

branch/UMPA

Files:

• tests/unit/test_utils/test_bits.py (modified) (1 diff)
• umpa/_packets.py (modified) (1 diff)
• umpa/utils/bits.py (modified) (2 diffs)

branch/UMPA/tests/unit/test_utils/test_bits.py

@@ -44 +44 @@
         assert split_number_into_chunks(0xFFFFF,4) == [0xF, 0xF, 0xF, 0xF, 0xF]
         assert split_number_into_chunks(0xFFFFF, 5) == [0x1F, 0x1F, 0x1F, 0x1F]
+
+    def test_amount(self):
+        assert split_number_into_chunks(0xFFFF,chunk_amount=3) == [0,0xFF,0xFF]
+        assert split_number_into_chunks(0xFFFF, 16, 2) == [0, 0xFFFF]
+
+        py.test.raises(UMPAException, split_number_into_chunks, 0xF, 1, 1)

branch/UMPA/umpa/_packets.py

@@ -170 +170 @@
         # we make it because we need string for socket object
         # so after that we pack it by struct module.pack()
-        byte_chunks = umpa.utils.bits.split_number_into_chunks(self.raw)
+        byte_chunks = umpa.utils.bits.split_number_into_chunks(
+                                        self.raw, chunk_amount=self.bits/BYTE)
         return struct.pack('!' + 'B'*(self.bits/BYTE), *byte_chunks)
 

branch/UMPA/umpa/utils/bits.py

@@ -24 +24 @@
 """
 
+from umpa.utils.exceptions import UMPAException
+
 BYTE = 8
 
-def split_number_into_chunks(number, chunk_size=BYTE):
+def split_number_into_chunks(number, chunk_size=BYTE, chunk_amount=None):
     """
     Split the big number into small chunks.
@@ -45 +47 @@
         chunks.append(number & mask)
         number >>= chunk_size
+
+    if chunk_amount is not None:
+        extend_zero = chunk_amount - len(chunks)
+        if extend_zero < 0:
+            raise UMPAException("Wrong amount of requested chunks. Requested "
+                                "%d, minimum %d." % (chunk_amount,len(chunks)))
+        chunks.extend([0]*extend_zero)
+
     chunks.reverse()
     return chunks