From b521f1b8ba209ec3bd2fa726c66d5ce2be16c4e6 Mon Sep 17 00:00:00 2001 From: Shivani Tipnis Date: Thu, 11 Oct 2018 11:49:32 +0530 Subject: [PATCH] nvs_util: Add Python2 and Python3 compatible --- .../nvs_partition_generator/nvs_partition_gen.py | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/components/nvs_flash/nvs_partition_generator/nvs_partition_gen.py b/components/nvs_flash/nvs_partition_generator/nvs_partition_gen.py index 003d1bab9b..2330c6102b 100755 --- a/components/nvs_flash/nvs_partition_generator/nvs_partition_gen.py +++ b/components/nvs_flash/nvs_partition_generator/nvs_partition_gen.py @@ -207,24 +207,13 @@ class Page(object): if self.is_encrypt: 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 - else: - encr_data[0:len(encr_data_ret)] = encr_data_ret - + encr_data[0:len(encr_data_ret)] = encr_data_ret data = encr_data data_offset = Page.FIRST_ENTRY_OFFSET + (Page.SINGLE_ENTRY_SIZE * self.entry_num) start_idx = data_offset 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 - else: - self.page_buf[start_idx:end_idx] = data - else: - self.page_buf[start_idx:end_idx] = data - + self.page_buf[start_idx:end_idx] = data # Set bitmap array for entries in current page for i in range(0, entrycount): -- 2.40.0