changes needed for SNMP docker upgrade to stretch build (sonic-net#23)

sonic_eeprom/eeprom_base.py

@@ -12,7 +12,10 @@
 from __future__ import print_function
 
 try:
-    import exceptions
+    import exceptions              # Python 2
+except ImportError:
+    import builtins as exceptions  # Python 3
+try:
     import binascii
     import optparse
     import os

sonic_eeprom/eeprom_dts.py

@@ -1,9 +1,12 @@
 #!/usr/bin/python
 # Copyright 2012 Cumulus Networks LLC, all rights reserved
 
+try:
+    import exceptions              # Python 2
+except ImportError:
+    import builtins as exceptions  # Python 3
 try:
     import os
-    import exceptions
     import binascii
     import subprocess
 except ImportError as e:

sonic_eeprom/eeprom_tlvinfo.py

@@ -12,13 +12,16 @@
 from __future__ import print_function
 
 try:
-    import exceptions
+    import exceptions              # Python 2
+except ImportError:
+    import builtins as exceptions  # Python 3
+try:
     import binascii
     import optparse
     import os
     import sys
-    import eeprom_base
     import redis
+    from . import eeprom_base    # Dot module supports both Python 2 and Python 3 using explicit relative import methods
 except ImportError as e:
     raise ImportError (str(e) + "- required module not found")
 

sonic_sfp/sff8436.py

@@ -16,7 +16,7 @@
     import types
     from math import log10
     from sff8024 import type_of_transceiver
-    from sffbase import sffbase
+    from .sffbase import sffbase    # Dot module supports both Python 2 and Python 3 using explicit relative import methods
 except ImportError as e:
     raise ImportError (str(e) + "- required module not found")
 

sonic_sfp/sff8472.py

@@ -18,7 +18,7 @@
     import types
     from math import log10
     from sff8024 import type_of_transceiver
-    from sffbase import sffbase
+    from .sffbase import sffbase    # Dot module supports both Python 2 and Python 3 using explicit relative import methods
 except ImportError as e:
     raise ImportError (str(e) + "- required module not found")
 

sonic_sfp/sfputilbase.py

@@ -10,12 +10,12 @@
     import binascii
     import os
     import re
-    import bcmshell
+    from . import bcmshell       # Dot module supports both Python 2 and Python 3 using explicit relative import methods
     from sonic_eeprom import eeprom_dts
-    from sff8472 import sff8472InterfaceId
-    from sff8472 import sff8472Dom
-    from sff8436 import sff8436InterfaceId
-    from sff8436 import sff8436Dom
+    from .sff8472 import sff8472InterfaceId  # Dot module supports both Python 2 and Python 3 using explicit relative import methods
+    from .sff8472 import sff8472Dom    # Dot module supports both Python 2 and Python 3 using explicit relative import methods
+    from .sff8436 import sff8436InterfaceId  # Dot module supports both Python 2 and Python 3 using explicit relative import methods
+    from .sff8436 import sff8436Dom    # Dot module supports both Python 2 and Python 3 using explicit relative import methods
     from inf8628 import inf8628InterfaceId
 except ImportError as e:
     raise ImportError("%s - required module not found" % str(e))