From ea59c0fb11a8f047f0db90b3bc2392616e558130 Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <57339448+Junchao-Mellanox@users.noreply.github.com>
Date: Tue, 29 Dec 2020 02:28:16 +0800
Subject: [PATCH] [sffbase.py] Fix to make Python 3-compatible (#156)

Change sffbase.py code to make it compatible with python3

1. change iteritems to items
2. change type(*) = types.* to type(*) = $typename
---
 sonic_platform_base/sonic_sfp/sffbase.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sonic_platform_base/sonic_sfp/sffbase.py b/sonic_platform_base/sonic_sfp/sffbase.py
index a1311e9bb0a3..a4e6c8e95ff6 100644
--- a/sonic_platform_base/sonic_sfp/sffbase.py
+++ b/sonic_platform_base/sonic_sfp/sffbase.py
@@ -2,7 +2,7 @@
 # sffbase class for sff8436 and sff8472
 #----------------------------------------------------------------------------
 
-from __future__ import print_function
+
 
 try:
     import fcntl
@@ -100,7 +100,7 @@ def parse_sff_element(self, eeprom_data, eeprom_ele, start_pos):
         elif type == 'bitmap':
             # Get the 'on' bitname
             bitvalue_dict = {}
-            for bitname, bitinfo in sorted(decode.iteritems()):
+            for bitname, bitinfo in sorted(decode.items()):
                 bitinfo_offset = bitinfo.get('offset') + start_pos
                 bitinfo_pos = bitinfo.get('bit')
                 bitinfo_value = bitinfo.get('value')
@@ -145,7 +145,7 @@ def parse_sff_element(self, eeprom_data, eeprom_ele, start_pos):
     # Recursively parses sff data into dictionary
     def parse_sff(self, eeprom_map, eeprom_data, start_pos):
         outdict = {}
-        for name, meta_data in sorted(eeprom_map.iteritems()):
+        for name, meta_data in sorted(eeprom_map.items()):
             type = meta_data.get('type')
 
             # Initialize output value
@@ -195,9 +195,9 @@ def parse(self, eeprom_map, eeprom_data, start_pos):
     def get_data_pretty_dict(self, indict):
         outdict = {}
 
-        for elem, elem_val in sorted(indict.iteritems()):
+        for elem, elem_val in sorted(indict.items()):
             value = elem_val.get('value')
-            if type(value) == types.DictType:
+            if type(value) == dict:
                 outdict[elem] = sffbase.get_data_pretty_dict(
                                 self, value)
             else:
@@ -229,13 +229,13 @@ def get_data_pretty(self, indata):
 
     # Dumps dict in pretty format
     def dump_pretty(self, indict):
-        for elem, elem_val in sorted(indict.iteritems()):
-            if type(elem_val) == types.DictType:
+        for elem, elem_val in sorted(indict.items()):
+            if type(elem_val) == dict:
                 print(self._indent, elem, ': ')
                 self.inc_indent()
                 sff8472.dump_pretty(self, elem_val)
                 self.dec_indent()
-            elif type(elem_val) == types.ListType:
+            elif type(elem_val) == list:
                 if len(elem_val) == 1:
                     print(self._indent, elem, ': ', elem_val.pop())
                 else: