Change import order in Ycable helper and EEPROM read bytearray change in SFP plugin (#177)

vpsubramaniam · V P Subramaniam · web-flow · commit fa024168a7b7 · 2021-03-23T12:21:33.000-07:00
- Import of sonic_platform before logger when platform API is not available leads to non import of logger resulting in xcvrd crash
- Since string and byte comparison returns true in python2 current check for differentiating python2 and 3 in EEPROM read fails.

Co-authored-by: V P Subramaniam &lt;Subramaniam_Vellalap@dell.com&gt;
diff --git a/sonic_platform_base/sonic_sfp/sfputilbase.py b/sonic_platform_base/sonic_sfp/sfputilbase.py
@@ -344,16 +344,10 @@ def _read_eeprom_specific_bytes(self, sysfsfile_eeprom, offset, num_bytes):
             return None
 
         try:
-            # in case raw is bytes (python3 is used) raw[n] will return int,
-            # and in case raw is str(python2 is used) raw[n] will return str,
-            # so for python3 the are no need to call ord to convert str to int.
-            # TODO: Remove this check once we no longer support Python 2
-            if type(raw) == bytes:
-                for n in range(0, num_bytes):
-                    eeprom_raw[n] = hex(raw[n])[2:].zfill(2)
-            else:
-                for n in range(0, num_bytes):
-                    eeprom_raw[n] = hex(ord(raw[n]))[2:].zfill(2)
+            # raw is changed to bytearray to support both python 2 and 3.
+            raw = bytearray(raw)
+            for n in range(0, num_bytes):
+                eeprom_raw[n] = hex(raw[n])[2:].zfill(2)
         except Exception:
             return None
 
diff --git a/sonic_y_cable/y_cable.py b/sonic_y_cable/y_cable.py
@@ -10,8 +10,8 @@
     import struct
     from ctypes import c_int8
 
-    import sonic_platform.platform
     from sonic_py_common import logger
+    import sonic_platform.platform
 except ImportError as e:
     # When build python3 xcvrd, it tries to do basic check which will import this file. However,
     # not all platform supports python3 API now, so it could cause an issue when importing
