summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTushar Gohad <tushar.gohad@intel.com>2014-04-18 05:52:43 -0700
committerTushar Gohad <tushar.gohad@intel.com>2014-04-18 06:05:09 -0700
commitc1a477c402cf3fe120a6e8357b9925c59dc7d506 (patch)
tree8e62abc97fcdb2d78f336f2be7bb27743247a650
parentf79f0b1a2025b78ac0bd2efb54731b83d224d740 (diff)
downloadpyeclib-c1a477c402cf3fe120a6e8357b9925c59dc7d506.tar.gz
Rename 'bytes' variables (a Python intrinsic)
Signed-off-by: Tushar Gohad <tushar.gohad@intel.com>
-rw-r--r--src/python/pyeclib/core.py24
-rw-r--r--src/python/pyeclib/ec_iface.py6
2 files changed, 15 insertions, 15 deletions
diff --git a/src/python/pyeclib/core.py b/src/python/pyeclib/core.py
index 89cdfd9..d0ffb35 100644
--- a/src/python/pyeclib/core.py
+++ b/src/python/pyeclib/core.py
@@ -133,8 +133,8 @@ class ECPyECLibDriver(object):
self.inline_chksum,
self.algsig_chksum)
- def encode(self, bytes):
- return pyeclib_c.encode(self.handle, bytes)
+ def encode(self, data):
+ return pyeclib_c.encode(self.handle, data)
def decode(self, fragment_payloads):
try:
@@ -159,7 +159,7 @@ class ECPyECLibDriver(object):
return ret_string
def reconstruct(self, fragment_payloads, indexes_to_reconstruct):
- reconstructed_bytes = []
+ reconstructed_data = []
# Reconstruct the data, then the parity
# The parity cannot be reconstructed until
@@ -176,9 +176,9 @@ class ECPyECLibDriver(object):
reconstructed = pyeclib_c.reconstruct(
self.handle, data_frags, parity_frags, missing_idxs,
index, len(data_frags[0]))
- reconstructed_bytes.append(reconstructed)
+ reconstructed_data.append(reconstructed)
- return reconstructed_bytes
+ return reconstructed_data
def fragments_needed(self, missing_fragment_indexes):
return pyeclib_c.get_required_fragments(
@@ -200,7 +200,7 @@ class ECNullDriver(object):
self.k = k
self.m = m
- def encode(self, bytes):
+ def encode(self, data):
pass
def decode(self, fragment_payloads):
@@ -243,26 +243,26 @@ class ECStripingDriver(object):
self.m = m
- def encode(self, bytes):
+ def encode(self, data):
"""
Stripe an arbitrary-sized string into k fragments
- :param bytes: the buffer to encode
+ :param data: the buffer to encode
:returns: a list of k buffers (data only)
:raises: ECPyECLibException if there is an error during encoding
"""
# Main fragment size
- fragment_size = math.ceil(len(bytes) / float(self.k))
+ fragment_size = math.ceil(len(data) / float(self.k))
# Size of last fragment
- last_fragment_size = len(bytes) - (fragment_size * self.k - 1)
+ last_fragment_size = len(data) - (fragment_size * self.k - 1)
fragments = []
offset = 0
for i in range(self.k - 1):
- fragments.append(bytes[offset:fragment_size])
+ fragments.append(data[offset:fragment_size])
offset += fragment_size
- fragments.append(bytes[offset:last_fragment_size])
+ fragments.append(data[offset:last_fragment_size])
return fragments
diff --git a/src/python/pyeclib/ec_iface.py b/src/python/pyeclib/ec_iface.py
index 9cf51e2..5b74b93 100644
--- a/src/python/pyeclib/ec_iface.py
+++ b/src/python/pyeclib/ec_iface.py
@@ -140,15 +140,15 @@ class ECDriver(object):
"The following required methods are not implemented "
"in %s: %s" % (library_import_str, not_implemented_str))
- def encode(self, bytes):
+ def encode(self, data):
"""
Encode an arbitrary-sized string
- :param bytes: the buffer to encode
+ :param data: the buffer to encode
:returns: a list of buffers (first k entries are data and
the last m are parity)
:raises: ECDriverError if there is an error during encoding
"""
- return self.ec_lib_reference.encode(bytes)
+ return self.ec_lib_reference.encode(data)
def decode(self, fragment_payloads):
"""