Finished Release v0.4.9

* develop:
  Avoid calling str with bytesarray
  Python 3 fix
  Use explicit integer division
  Fix Python 3 incompatibility

Author: grzn

src/infi/asi/cdb/compare_and_write.py

@@ -38,7 +38,7 @@ def __init__(self, logical_block_address, buffer, number_of_logical_blocks, bloc
         self.buffer = buffer
         self.block_size = block_size
         self.number_of_logical_blocks = number_of_logical_blocks
-        self.transfer_length = len(buffer) / block_size
+        self.transfer_length = len(buffer) // block_size
         assert len(buffer) % block_size == 0, "buffer length {0} is not a multiple of {1}".format(len(buffer), block_size)
 
     def execute(self, executer):

src/infi/asi/cdb/inquiry/standard.py

@@ -23,7 +23,7 @@ class StandardInquiryExtendedDataBuffer(Buffer):
     # bytes_ref[21] - reserved
     version_descriptors = list_field(type=b_uint16,
                                      where=bytes_ref[22:],
-                                     n=min_ref((input_buffer_length - 22) / 2, 8),  # / 2 because sizeof(uint16) == 2
+                                     n=min_ref((input_buffer_length - 22) // 2, 8),  # / 2 because sizeof(uint16) == 2
                                      unpack_if=input_buffer_length >= 24)
     # bytes_ref[38:60] - reserved
     vendor_specific_2 = bytearray_field(where=bytes_ref[60:], unpack_if=input_buffer_length >= 61,

src/infi/asi/cdb/persist/input.py

@@ -28,7 +28,7 @@ class PersistentReserveInReadKeysResponse(CDBBuffer):
     additional_length = be_uint_field(where=bytes_ref[4:8])
     key_list = list_field(where=bytes_ref[8:8+additional_length],
                           type=b_uint64,
-                          n=additional_length / 8, # divide by number of bytes
+                          n=additional_length // 8, # divide by number of bytes
                                                    # per key.
                           unpack_if=input_buffer_length >= additional_length + 8)
 
@@ -159,4 +159,4 @@ def execute(self, executer):
     PERSISTENT_RESERVE_IN_SERVICE_ACTION_CODES.READ_RESERVATION: PersistentReserveInReadReservationResponse,
     PERSISTENT_RESERVE_IN_SERVICE_ACTION_CODES.REPORT_CAPABILITES: PersistentReserveInReportCapabilitesResponse,
     PERSISTENT_RESERVE_IN_SERVICE_ACTION_CODES.READ_FULL_STATUS: PersistentReserveInReadFullStatusResponse
-}
+}

src/infi/asi/cdb/receive_copy_operating_parameters.py

@@ -13,7 +13,7 @@ class ReceiveCopyOperatingParametersCommand(CDBBuffer):
 
     def execute(self, executer):
         datagram = self.create_datagram()
-        result_datagram = yield executer.call(SCSIReadCommand(str(datagram), self.allocation_length))
+        result_datagram = yield executer.call(SCSIReadCommand(bytes(datagram), self.allocation_length))
         result = ReceiveCopyOperatingParametersResponse()
         result.unpack(result_datagram)
         yield result

src/infi/asi/cdb/rtpg.py

@@ -1,3 +1,4 @@
+import sys
 from . import CDB
 from .. import SCSIReadCommand
 from .operation_code import OperationCode
@@ -6,10 +7,15 @@
 from ..errors import AsiException
 # spc4r30: 6.4.1 (page 259)
 from infi.instruct import UBInt32
-from cStringIO import StringIO
 from infi.instruct.buffer import *
 
 
+if sys.version_info[0] == 2:
+    from cStringIO import StringIO
+else:
+    from io import StringIO
+
+
 CDB_OPCODE = 0xA3
 
 class TruncationError(AsiException):

src/infi/asi/cdb/unmap.py

@@ -28,7 +28,7 @@ def __init__(self, ranges_list=[]):
             unmap_obj=UnmapParameterListBlock(range[0], range[1])
             self.unmap_ubjects.append(unmap_obj)
             blocks.append(unmap_obj.datagram)
-        block_stream = ''.join(blocks)
+        block_stream = b''.join(blocks)
 
         self.header_obj=UnmapParameterListHeader(len(block_stream))
         self.buffer=self.header_obj.datagram +block_stream

src/infi/asi/cdb/write.py

@@ -35,7 +35,7 @@ def __init__(self, logical_block_address, buffer, block_size=DEFAULT_BLOCK_SIZE)
         assert self.logical_block_address < 2 ** 21, "lba > 2**21"
         assert len(buffer) % block_size == 0, "buffer length {0} is not a multiple of {1}".format(len(buffer), block_size)
 
-        num_blocks = len(buffer) / block_size
+        num_blocks = len(buffer) // block_size
         assert 0 < num_blocks <= 256, "number_of_blocks should be in range [1, 2**8]"
         if num_blocks == 256:
             self.transfer_length = 0
@@ -73,7 +73,7 @@ def __init__(self, logical_block_address, buffer, block_size=DEFAULT_BLOCK_SIZE)
         self.logical_block_address = logical_block_address
         self.buffer = buffer
         self.block_size = block_size
-        self.transfer_length = len(buffer) / block_size
+        self.transfer_length = len(buffer) // block_size
         assert len(buffer) % block_size == 0, "buffer length {0} is not a multiple of {1}".format(len(buffer), block_size)
         assert self.logical_block_address < 2 ** 32, "lba > 2**32"
         assert 0 <= self.transfer_length < 2 ** 16, "number_of_blocks should be in range [0, 2**16)"
@@ -107,7 +107,7 @@ def __init__(self, logical_block_address, buffer, block_size=DEFAULT_BLOCK_SIZE)
         self.logical_block_address = logical_block_address
         self.buffer = buffer
         self.block_size = block_size
-        self.transfer_length = len(buffer) / block_size
+        self.transfer_length = len(buffer) // block_size
         assert len(buffer) % block_size == 0, "buffer length {0} is not a multiple of {1}".format(len(buffer), block_size)
         assert self.logical_block_address < 2 ** 32, "lba > 2**32"
         assert 0 < self.transfer_length < 2 ** 32, "number_of_blocks should be in range [0, 2**32)"
@@ -141,7 +141,7 @@ def __init__(self, logical_block_address, buffer, block_size=DEFAULT_BLOCK_SIZE)
         self.logical_block_address = logical_block_address
         self.buffer = buffer
         self.block_size = block_size
-        self.transfer_length = len(buffer) / block_size
+        self.transfer_length = len(buffer) // block_size
         assert len(buffer) % block_size == 0, "buffer length {0} is not a multiple of {1}".format(len(buffer), block_size)
         assert self.logical_block_address < 2 ** 64, "lba > 2**64"
         assert 0 <= self.transfer_length < 2 ** 32, "number_of_blocks should be in range [0, 2**32)"