espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 20:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

nvs_util: Add Python2 and Python3 compatible

Browse Source
This commit is contained in:
Shivani Tipnis
2018-10-11 11:49:32 +05:30
parent 0064357a98
commit b521f1b8ba
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/nvs_flash/nvs_partition_generator/nvs_partition_gen.py
View File

@@ -207,24 +207,13 @@ class Page(object):
if self.is_encrypt: if self.is_encrypt:
encr_data_ret = self.encrypt_data(data, entrycount,nvs_obj) encr_data_ret = self.encrypt_data(data, entrycount,nvs_obj)
if sys.version_info[0] < 3:
encr_data[0:len(encr_data_ret)] = encr_data_ret encr_data[0:len(encr_data_ret)] = encr_data_ret
else:
encr_data[0:len(encr_data_ret)] = encr_data_ret
data = encr_data data = encr_data
data_offset = Page.FIRST_ENTRY_OFFSET + (Page.SINGLE_ENTRY_SIZE * self.entry_num) data_offset = Page.FIRST_ENTRY_OFFSET + (Page.SINGLE_ENTRY_SIZE * self.entry_num)
start_idx = data_offset start_idx = data_offset
end_idx = data_offset + len(data) end_idx = data_offset + len(data)
if not sys.version_info[0] < 3:
if type(data) == str:
self.page_buf[start_idx:end_idx] = data self.page_buf[start_idx:end_idx] = data
else:
self.page_buf[start_idx:end_idx] = data
else:
self.page_buf[start_idx:end_idx] = data
# Set bitmap array for entries in current page # Set bitmap array for entries in current page
for i in range(0, entrycount): for i in range(0, entrycount):