|
2 | 2 | # sffbase class for sff8436 and sff8472
|
3 | 3 | #----------------------------------------------------------------------------
|
4 | 4 |
|
5 |
| -from __future__ import print_function |
| 5 | + |
6 | 6 |
|
7 | 7 | try:
|
8 | 8 | import fcntl
|
@@ -100,7 +100,7 @@ def parse_sff_element(self, eeprom_data, eeprom_ele, start_pos):
|
100 | 100 | elif type == 'bitmap':
|
101 | 101 | # Get the 'on' bitname
|
102 | 102 | bitvalue_dict = {}
|
103 |
| - for bitname, bitinfo in sorted(decode.iteritems()): |
| 103 | + for bitname, bitinfo in sorted(decode.items()): |
104 | 104 | bitinfo_offset = bitinfo.get('offset') + start_pos
|
105 | 105 | bitinfo_pos = bitinfo.get('bit')
|
106 | 106 | bitinfo_value = bitinfo.get('value')
|
@@ -145,7 +145,7 @@ def parse_sff_element(self, eeprom_data, eeprom_ele, start_pos):
|
145 | 145 | # Recursively parses sff data into dictionary
|
146 | 146 | def parse_sff(self, eeprom_map, eeprom_data, start_pos):
|
147 | 147 | outdict = {}
|
148 |
| - for name, meta_data in sorted(eeprom_map.iteritems()): |
| 148 | + for name, meta_data in sorted(eeprom_map.items()): |
149 | 149 | type = meta_data.get('type')
|
150 | 150 |
|
151 | 151 | # Initialize output value
|
@@ -195,9 +195,9 @@ def parse(self, eeprom_map, eeprom_data, start_pos):
|
195 | 195 | def get_data_pretty_dict(self, indict):
|
196 | 196 | outdict = {}
|
197 | 197 |
|
198 |
| - for elem, elem_val in sorted(indict.iteritems()): |
| 198 | + for elem, elem_val in sorted(indict.items()): |
199 | 199 | value = elem_val.get('value')
|
200 |
| - if type(value) == types.DictType: |
| 200 | + if type(value) == dict: |
201 | 201 | outdict[elem] = sffbase.get_data_pretty_dict(
|
202 | 202 | self, value)
|
203 | 203 | else:
|
@@ -229,13 +229,13 @@ def get_data_pretty(self, indata):
|
229 | 229 |
|
230 | 230 | # Dumps dict in pretty format
|
231 | 231 | def dump_pretty(self, indict):
|
232 |
| - for elem, elem_val in sorted(indict.iteritems()): |
233 |
| - if type(elem_val) == types.DictType: |
| 232 | + for elem, elem_val in sorted(indict.items()): |
| 233 | + if type(elem_val) == dict: |
234 | 234 | print(self._indent, elem, ': ')
|
235 | 235 | self.inc_indent()
|
236 | 236 | sff8472.dump_pretty(self, elem_val)
|
237 | 237 | self.dec_indent()
|
238 |
| - elif type(elem_val) == types.ListType: |
| 238 | + elif type(elem_val) == list: |
239 | 239 | if len(elem_val) == 1:
|
240 | 240 | print(self._indent, elem, ': ', elem_val.pop())
|
241 | 241 | else:
|
|
0 commit comments