Standardize the try-except import statements if checking for "do I have the lib?" (fixed #60)

Author: markuslf

db_mysql3.py

@@ -15,28 +15,26 @@
 """
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2022021601'
+__version__ = '2022021701'
 
 from .globals3 import STATE_UNKNOWN
 
 try:
     import mysql.connector
-except ImportError as e:
-    mysql_connector_found = False
-else:
-    mysql_connector_found = True
+    HAVE_MYSQL_CONNECTOR = True
+except ImportError:
+    HAVE_MYSQL_CONNECTOR = False
 
 from . import base3
 
-if mysql_connector_found and base3.version(mysql.connector.__version__) < base3.version('2.0.0'):
+if HAVE_MYSQL_CONNECTOR and base3.version(mysql.connector.__version__) < base3.version('2.0.0'):
     try:
         import MySQLdb.cursors
+        HAVE_MYSQL_CURSORS = True
     except ImportError as e:
-        mysql_cursors_found = False
-    else:
-        mysql_cursors_found = True
+        HAVE_MYSQL_CURSORS = False
 else:
-    mysql_cursors_found = None
+    HAVE_MYSQL_CURSORS = None
 
 
 def close(conn):
@@ -74,9 +72,9 @@ def connect(mysql_connection):
     >>> conn = connect(mysql_connection)
     """
 
-    if mysql_connector_found is False:
+    if HAVE_MYSQL_CONNECTOR is False:
         base3.oao('Python module "mysql.connector" is not installed.', STATE_UNKNOWN)
-    if mysql_connector_found is False:
+    if HAVE_MYSQL_CONNECTOR is False:
         base3.oao('Python module "MySQLdb.cursors" is not installed.', STATE_UNKNOWN)
 
     try:
@@ -93,9 +91,9 @@ def select(conn, sql, data={}, fetchone=False):
     database.
     """
 
-    if mysql_connector_found is False:
+    if HAVE_MYSQL_CONNECTOR is False:
         base3.oao('Python module "mysql.connector" is not installed.', STATE_UNKNOWN)
-    if mysql_connector_found is False:
+    if HAVE_MYSQL_CONNECTOR is False:
         base3.oao('Python module "MySQLdb.cursors" is not installed.', STATE_UNKNOWN)
 
     if base3.version(mysql.connector.__version__) >= base3.version('2.0.0'):

net3.py

@@ -13,16 +13,16 @@
 """
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2022021602'
+__version__ = '2022021701'
 
 import random
 import re
 import socket
 try:
     import netifaces
-    lib_netifaces = True
-except ImportError as e:
-    lib_netifaces = False
+    HAVE_NETIFACES = True
+except ImportError:
+    HAVE_NETIFACES = False
 
 from . import txt3 # pylint: disable=C0413
 from . import url3 # pylint: disable=C0413
@@ -195,7 +195,7 @@ def get_ip_public():
 
 
 def get_netinfo():
-    if lib_netifaces:
+    if HAVE_NETIFACES:
         # Update stats using the netifaces lib
         try:
             default_gw = netifaces.gateways()['default'][netifaces.AF_INET]
@@ -208,7 +208,7 @@ def get_netinfo():
             stats['mask'] = netifaces.ifaddresses(default_gw[1])[netifaces.AF_INET][0]['netmask']
             stats['mask_cidr'] = ip_to_cidr(stats['mask'])
             stats['gateway'] = netifaces.gateways()['default'][netifaces.AF_INET][0]
-        except (KeyError, AttributeError) as e:
+        except (KeyError, AttributeError):
             return []
 
         stats['public_address'] = None

psutil3.py

@@ -12,7 +12,7 @@
 """
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2021050301'
+__version__ = '2022021701'
 
 import sys
 
@@ -37,5 +37,5 @@ def get_partitions(ignore=[]):
             lambda part: not any(
                 ignore_item in part.mountpoint for ignore_item in ignore),
             psutil.disk_partitions(all=False)
-            )
         )
+    )

winrm3.py

@@ -12,14 +12,13 @@
 """
 
 __author__ = 'Linuxfabrik GmbH, Zurich/Switzerland'
-__version__ = '2022021601'
+__version__ = '2022021701'
 
 try:
     import winrm
-except ImportError as e:
-    winrm_found = False
-else:
-    winrm_found = True
+    HAVE_WINRM = True
+except ImportError:
+    HAVE_WINRM = False
 
 from . import txt3