File python-fix-except-for-python-3.patch of Package ganglia

From: Egbert Eich <eich@suse.com>
Date: Thu Feb 22 20:56:44 2018 +0100
Subject: python: fix 'except' for python 3
Patch-mainline: never
Git-commit: 4ee2789b84b31b7929d41fbf7a2d7aa173da95b7
References: 


Signed-off-by: Egbert Eich <eich@suse.com>
---
 gmond/python_modules/db/DBUtil.py           | 2 +-
 gmond/python_modules/db/mysql.py            | 3 ++-
 gmond/python_modules/db/redis.py            | 2 +-
 gmond/python_modules/memcached/memcached.py | 6 +++---
 gmond/python_modules/network/tcpconn.py     | 4 ++--
 gmond/python_modules/process/procstat.py    | 4 ++--
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/gmond/python_modules/db/DBUtil.py b/gmond/python_modules/db/DBUtil.py
index 2504c24..f7b93ee 100644
--- a/gmond/python_modules/db/DBUtil.py
+++ b/gmond/python_modules/db/DBUtil.py
@@ -280,5 +280,5 @@ if __name__ == '__main__':
                 cursor.close()
 
                 conn.close()
-        except MySQLdb.OperationalError, (errno, errmsg):
+        except MySQLdb.OperationalError as e:
                 raise
diff --git a/gmond/python_modules/db/mysql.py b/gmond/python_modules/db/mysql.py
index e7a7edb..ffc5376 100644
--- a/gmond/python_modules/db/mysql.py
+++ b/gmond/python_modules/db/mysql.py
@@ -165,7 +165,8 @@ def update_stats(get_innodb=True, get_master=True, get_slave=True):
         cursor.close()
 
         conn.close()
-    except MySQLdb.OperationalError, (errno, errmsg):
+    except MySQLdb.OperationalError as e:
+        errno, errmsg = e.args
         logging.error('error updating stats')
         logging.error(errmsg)
         return False
diff --git a/gmond/python_modules/db/redis.py b/gmond/python_modules/db/redis.py
index 4e682b7..0310d80 100755
--- a/gmond/python_modules/db/redis.py
+++ b/gmond/python_modules/db/redis.py
@@ -83,7 +83,7 @@ def metric_handler(name):
                           v = cps
                   #logging.debug("submittincg metric %s is %s" % (n, int(v)))
                   metric_handler.info[n] = int(v)  # TODO Use value_type.
-        except Exception, e:
+        except Exception as e:
             #logging.debug("caught exception %s" % e)
             pass
         s.close()
diff --git a/gmond/python_modules/memcached/memcached.py b/gmond/python_modules/memcached/memcached.py
index 0d6c8e6..88e460e 100644
--- a/gmond/python_modules/memcached/memcached.py
+++ b/gmond/python_modules/memcached/memcached.py
@@ -94,18 +94,18 @@ class UpdateMetricThread(threading.Thread):
                             try:
                                 data = fd.recv(8192)
                                 msg += data
-                            except (IOError, OSError), e:
+                            except (IOError, OSError) as e:
                                 if e.errno != errno.EINTR:
                                     raise
 
                     if msg.find("END"):
                         break
-                except select.error, e:
+                except select.error as e:
                     if e[0] != errno.EINTR:
                         raise
 
             sock.close()
-        except socket.error, e:
+        except socket.error as e:
             print ("ERROR: %s" % e, file=sys.stderr)
 
         for m in msg.split("\r\n"):
diff --git a/gmond/python_modules/network/tcpconn.py b/gmond/python_modules/network/tcpconn.py
index 73abb41..b97d0ed 100644
--- a/gmond/python_modules/network/tcpconn.py
+++ b/gmond/python_modules/network/tcpconn.py
@@ -233,7 +233,7 @@ class NetstatThread(threading.Thread):
         if self.popenChild != None:
             try:
                 self.popenChild.wait()
-            except OSError, e:
+            except OSError as e:
                 if e.errno == 10:  # No child processes
                     pass
 
@@ -274,7 +274,7 @@ class NetstatThread(threading.Thread):
 
             try:
                 self.popenChild.wait()
-            except OSError, e:
+            except OSError as e:
                 if e.errno == 10:  # No child process
                     continue
 
diff --git a/gmond/python_modules/process/procstat.py b/gmond/python_modules/process/procstat.py
index b07ece7..903d20c 100644
--- a/gmond/python_modules/process/procstat.py
+++ b/gmond/python_modules/process/procstat.py
@@ -251,7 +251,7 @@ def test(params):
 
         try:
             (ppid, pgid) = get_pgid(proc)
-        except Exception, e:
+        except Exception as e:
             print(' failed getting pgid: ' + str(e))
             continue
 
@@ -292,7 +292,7 @@ def update_stats():
         # Update CPU utilization
         try:
             (ppid, pgid) = get_pgid(proc)
-        except Exception, e:
+        except Exception as e:
             logging.warning(' failed getting pgid: ' + str(e))
             stats[proc]['cpu'] = 0.0
             stats[proc]['mem'] = 0