From 7a30ae09416ef4f64bad0684be823a2827af0fcf Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Tue, 11 Aug 2020 09:49:21 -0700
Subject: [PATCH] Python 3 compliance (#85)

As part of the migration from Python 2 to Python 3, this PR ensures that all Python files in sonic-platform-daemons are Python 3-compliant, and work with both Python 2 and Python 3.

Once this is merged, we can begin building Python 3-based versions of the sonic-platform-daemons packages.
---
 sonic-ledd/scripts/ledd             | 12 ++++++------
 sonic-pcied/scripts/pcied           |  2 +-
 sonic-psud/scripts/psud             |  2 +-
 sonic-syseepromd/scripts/syseepromd |  2 +-
 sonic-xcvrd/scripts/xcvrd           |  4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/sonic-ledd/scripts/ledd b/sonic-ledd/scripts/ledd
index 331ccb20d73b..f27296ce652e 100644
--- a/sonic-ledd/scripts/ledd
+++ b/sonic-ledd/scripts/ledd
@@ -11,7 +11,7 @@ try:
 
     from sonic_py_common import daemon_base
     from swsscommon import swsscommon
-except ImportError, e:
+except ImportError as e:
     raise ImportError (str(e) + " - required module not found")
 
 #============================= Constants =============================
@@ -45,17 +45,17 @@ class DaemonLedd(daemon_base.DaemonBase):
                 (options, remainder) = getopt.getopt(sys.argv[1:],
                                                    'hv',
                                                    ['help', 'version'])
-            except getopt.GetoptError, e:
-                print e
-                print USAGE_HELP
+            except getopt.GetoptError as e:
+                print(e)
+                print(USAGE_HELP)
                 sys.exit(2)
 
             for opt, arg in options:
                 if opt == '--help' or opt == '-h':
-                    print USAGE_HELP
+                    print(USAGE_HELP)
                     sys.exit(0)
                 elif opt == '--version' or opt == '-v':
-                    print 'ledd version ' + VERSION
+                    print('ledd version ' + VERSION)
                     sys.exit(0)
 
         # Load platform-specific LedControl module
diff --git a/sonic-pcied/scripts/pcied b/sonic-pcied/scripts/pcied
index d34519d46213..fd986f984390 100644
--- a/sonic-pcied/scripts/pcied
+++ b/sonic-pcied/scripts/pcied
@@ -15,7 +15,7 @@ try:
     import swsssdk
     from sonic_py_common.daemon_base import DaemonBase
     from sonic_py_common.device_info import get_platform
-except ImportError, e:
+except ImportError as e:
     raise ImportError(str(e) + " - required module not found")
 
 #
diff --git a/sonic-psud/scripts/psud b/sonic-psud/scripts/psud
index 8e776d78ce43..f6ca3dbc1909 100644
--- a/sonic-psud/scripts/psud
+++ b/sonic-psud/scripts/psud
@@ -16,7 +16,7 @@ try:
 
     from sonic_py_common import daemon_base
     from swsscommon import swsscommon
-except ImportError, e:
+except ImportError as e:
     raise ImportError (str(e) + " - required module not found")
 
 #
diff --git a/sonic-syseepromd/scripts/syseepromd b/sonic-syseepromd/scripts/syseepromd
index 5fb4a35815f0..855186061233 100644
--- a/sonic-syseepromd/scripts/syseepromd
+++ b/sonic-syseepromd/scripts/syseepromd
@@ -15,7 +15,7 @@ try:
 
     from sonic_py_common import daemon_base
     from swsscommon import swsscommon
-except ImportError, e:
+except ImportError as e:
     raise ImportError (str(e) + " - required module not found")
 
 PLATFORM_SPECIFIC_MODULE_NAME = 'eeprom'
diff --git a/sonic-xcvrd/scripts/xcvrd b/sonic-xcvrd/scripts/xcvrd
index 6c5cb8b1c5f7..3ed032272197 100644
--- a/sonic-xcvrd/scripts/xcvrd
+++ b/sonic-xcvrd/scripts/xcvrd
@@ -19,7 +19,7 @@ try:
     from enum import Enum
     from sonic_py_common import daemon_base, device_info, logger
     from swsscommon import swsscommon
-except ImportError, e:
+except ImportError as e:
     raise ImportError (str(e) + " - required module not found")
 
 #
@@ -1128,7 +1128,7 @@ class DaemonXcvrd(daemon_base.DaemonBase):
         try:
             port_config_file_path = device_info.get_path_to_port_config_file()
             platform_sfputil.read_porttab_mappings(port_config_file_path)
-        except Exception, e:
+        except Exception as e:
             self.log_error("Failed to read port info: %s" % (str(e)), True)
             sys.exit(PORT_CONFIG_LOAD_ERROR)