From bd441a519d28bdf3b6393fbc145623e22d0604d2 Mon Sep 17 00:00:00 2001 From: Julien Fortin Date: Tue, 17 Dec 2019 17:25:32 +0100 Subject: [PATCH] python3: pypi support: except ImportError and ModuleNotFoundError Signed-off-by: Julien Fortin --- ifupdown2/addons/address.py | 2 +- ifupdown2/addons/addressvirtual.py | 2 +- ifupdown2/addons/bond.py | 2 +- ifupdown2/addons/bridge.py | 2 +- ifupdown2/addons/bridgevlan.py | 2 +- ifupdown2/addons/dhcp.py | 2 +- ifupdown2/addons/ethtool.py | 2 +- ifupdown2/addons/link.py | 2 +- ifupdown2/addons/mstpctl.py | 2 +- ifupdown2/addons/tunnel.py | 2 +- ifupdown2/addons/usercmds.py | 2 +- ifupdown2/addons/vlan.py | 2 +- ifupdown2/addons/vrf.py | 2 +- ifupdown2/addons/vrrpd.py | 2 +- ifupdown2/addons/vxlan.py | 2 +- ifupdown2/ifupdown/argv.py | 2 +- ifupdown2/ifupdown/client.py | 2 +- ifupdown2/ifupdown/ifupdownmain.py | 2 +- ifupdown2/ifupdown/main.py | 2 +- ifupdown2/ifupdown/networkinterfaces.py | 2 +- ifupdown2/ifupdown/scheduler.py | 2 +- ifupdown2/ifupdown/statemanager.py | 2 +- ifupdown2/ifupdown/template.py | 2 +- ifupdown2/ifupdown/utils.py | 2 +- ifupdown2/ifupdownaddons/dhclient.py | 2 +- ifupdown2/ifupdownaddons/modulebase.py | 2 +- ifupdown2/ifupdownaddons/mstpctlutil.py | 2 +- ifupdown2/ifupdownaddons/systemutils.py | 2 +- ifupdown2/ifupdownaddons/utilsbase.py | 2 +- ifupdown2/lib/addon.py | 2 +- ifupdown2/lib/base_objects.py | 2 +- ifupdown2/lib/io.py | 2 +- ifupdown2/lib/iproute2.py | 2 +- ifupdown2/lib/nlcache.py | 2 +- ifupdown2/lib/sysfs.py | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/ifupdown2/addons/address.py b/ifupdown2/addons/address.py index 7b172ba..3abc4c4 100644 --- a/ifupdown2/addons/address.py +++ b/ifupdown2/addons/address.py @@ -22,7 +22,7 @@ try: import ifupdown2.ifupdown.policymanager as policymanager import ifupdown2.ifupdown.ifupdownflags as ifupdownflags import ifupdown2.ifupdown.ifupdownconfig as ifupdownconfig -except ImportError: +except (ImportError, ModuleNotFoundError): from lib.addon import Addon from nlmanager.nlmanager import Link diff --git a/ifupdown2/addons/addressvirtual.py b/ifupdown2/addons/addressvirtual.py index c477e17..1eb668e 100644 --- a/ifupdown2/addons/addressvirtual.py +++ b/ifupdown2/addons/addressvirtual.py @@ -24,7 +24,7 @@ try: import ifupdown2.ifupdown.policymanager as policymanager import ifupdown2.ifupdown.ifupdownflags as ifupdownflags import ifupdown2.ifupdown.ifupdownconfig as ifupdownconfig -except ImportError: +except (ImportError, ModuleNotFoundError): from lib.addon import Addon from ifupdown.iface import * from ifupdown.utils import utils diff --git a/ifupdown2/addons/bond.py b/ifupdown2/addons/bond.py index a4f83aa..394192d 100644 --- a/ifupdown2/addons/bond.py +++ b/ifupdown2/addons/bond.py @@ -20,7 +20,7 @@ try: import ifupdown2.ifupdown.ifupdownflags as ifupdownflags from ifupdown2.ifupdownaddons.modulebase import moduleBase -except ImportError: +except (ImportError, ModuleNotFoundError): from lib.addon import Addon from nlmanager.nlmanager import Link diff --git a/ifupdown2/addons/bridge.py b/ifupdown2/addons/bridge.py index 4e58a38..e6894f1 100644 --- a/ifupdown2/addons/bridge.py +++ b/ifupdown2/addons/bridge.py @@ -24,7 +24,7 @@ try: from ifupdown2.ifupdownaddons.cache import * from ifupdown2.ifupdownaddons.modulebase import moduleBase -except ImportError: +except (ImportError, ModuleNotFoundError): from lib.addon import Addon import ifupdown.exceptions as exceptions diff --git a/ifupdown2/addons/bridgevlan.py b/ifupdown2/addons/bridgevlan.py index 4ebde30..e6f536f 100644 --- a/ifupdown2/addons/bridgevlan.py +++ b/ifupdown2/addons/bridgevlan.py @@ -12,7 +12,7 @@ try: from ifupdown2.ifupdownaddons.modulebase import moduleBase import ifupdown2.ifupdown.ifupdownflags as ifupdownflags -except ImportError: +except (ImportError, ModuleNotFoundError): from lib.addon import Addon from ifupdown.iface import * diff --git a/ifupdown2/addons/dhcp.py b/ifupdown2/addons/dhcp.py index fcb2966..3333abb 100644 --- a/ifupdown2/addons/dhcp.py +++ b/ifupdown2/addons/dhcp.py @@ -19,7 +19,7 @@ try: from ifupdown2.ifupdownaddons.dhclient import dhclient from ifupdown2.ifupdownaddons.modulebase import moduleBase -except ImportError: +except (ImportError, ModuleNotFoundError): from lib.addon import Addon import ifupdown.policymanager as policymanager diff --git a/ifupdown2/addons/ethtool.py b/ifupdown2/addons/ethtool.py index 781f76d..7c1e76b 100644 --- a/ifupdown2/addons/ethtool.py +++ b/ifupdown2/addons/ethtool.py @@ -18,7 +18,7 @@ try: from ifupdown2.ifupdownaddons.utilsbase import * from ifupdown2.ifupdownaddons.modulebase import moduleBase -except ImportError: +except (ImportError, ModuleNotFoundError): from lib.addon import Addon import ifupdown.ifupdownflags as ifupdownflags diff --git a/ifupdown2/addons/link.py b/ifupdown2/addons/link.py index 862a95d..1832014 100644 --- a/ifupdown2/addons/link.py +++ b/ifupdown2/addons/link.py @@ -18,7 +18,7 @@ try: import ifupdown2.ifupdown.ifupdownflags as ifupdownflags import ifupdown2.ifupdown.policymanager as policymanager -except ImportError: +except (ImportError, ModuleNotFoundError): from lib.addon import Addon from ifupdown.iface import * from ifupdown.utils import utils diff --git a/ifupdown2/addons/mstpctl.py b/ifupdown2/addons/mstpctl.py index c03a7f8..0a577b4 100644 --- a/ifupdown2/addons/mstpctl.py +++ b/ifupdown2/addons/mstpctl.py @@ -19,7 +19,7 @@ try: from ifupdown2.ifupdownaddons.mstpctlutil import mstpctlutil from ifupdown2.ifupdownaddons.systemutils import systemUtils from ifupdown2.ifupdown.exceptions import moduleNotSupported -except ImportError: +except (ImportError, ModuleNotFoundError): from lib.addon import Addon from ifupdown.iface import * diff --git a/ifupdown2/addons/tunnel.py b/ifupdown2/addons/tunnel.py index 2a27467..c238d2d 100644 --- a/ifupdown2/addons/tunnel.py +++ b/ifupdown2/addons/tunnel.py @@ -12,7 +12,7 @@ try: from ifupdown2.ifupdownaddons.modulebase import moduleBase import ifupdown2.ifupdown.ifupdownflags as ifupdownflags -except ImportError: +except (ImportError, ModuleNotFoundError): from lib.addon import Addon from nlmanager.nlmanager import Link diff --git a/ifupdown2/addons/usercmds.py b/ifupdown2/addons/usercmds.py index a7dcec7..317db09 100644 --- a/ifupdown2/addons/usercmds.py +++ b/ifupdown2/addons/usercmds.py @@ -10,7 +10,7 @@ try: from ifupdown2.ifupdown.utils import utils from ifupdown2.ifupdownaddons.modulebase import moduleBase -except ImportError: +except (ImportError, ModuleNotFoundError): from ifupdown.utils import utils from ifupdownaddons.modulebase import moduleBase diff --git a/ifupdown2/addons/vlan.py b/ifupdown2/addons/vlan.py index d3ba5b9..5a2965e 100644 --- a/ifupdown2/addons/vlan.py +++ b/ifupdown2/addons/vlan.py @@ -10,7 +10,7 @@ try: from ifupdown2.nlmanager.nlmanager import Link from ifupdown2.ifupdownaddons.modulebase import moduleBase import ifupdown2.ifupdown.ifupdownflags as ifupdownflags -except ImportError: +except (ImportError, ModuleNotFoundError): from lib.addon import Addon from ifupdown.iface import * from nlmanager.nlmanager import Link diff --git a/ifupdown2/addons/vrf.py b/ifupdown2/addons/vrf.py index e7a8104..07dd3eb 100644 --- a/ifupdown2/addons/vrf.py +++ b/ifupdown2/addons/vrf.py @@ -25,7 +25,7 @@ try: from ifupdown2.ifupdownaddons.dhclient import dhclient from ifupdown2.ifupdownaddons.utilsbase import * from ifupdown2.ifupdownaddons.modulebase import moduleBase -except ImportError: +except (ImportError, ModuleNotFoundError): from lib.addon import Addon import ifupdown.policymanager as policymanager diff --git a/ifupdown2/addons/vrrpd.py b/ifupdown2/addons/vrrpd.py index 5b9c5a0..e09d154 100644 --- a/ifupdown2/addons/vrrpd.py +++ b/ifupdown2/addons/vrrpd.py @@ -16,7 +16,7 @@ try: from ifupdown2.ifupdown.iface import * from ifupdown2.ifupdown.utils import utils -except ImportError: +except (ImportError, ModuleNotFoundError): import ifupdown.ifupdownflags as ifupdownflags from ifupdownaddons.modulebase import moduleBase diff --git a/ifupdown2/addons/vxlan.py b/ifupdown2/addons/vxlan.py index 0e06376..e005b30 100644 --- a/ifupdown2/addons/vxlan.py +++ b/ifupdown2/addons/vxlan.py @@ -20,7 +20,7 @@ try: from ifupdown2.ifupdown.utils import utils from ifupdown2.ifupdownaddons.cache import * from ifupdown2.ifupdownaddons.modulebase import moduleBase -except ImportError: +except (ImportError, ModuleNotFoundError): import ifupdown.policymanager as policymanager import ifupdown.ifupdownflags as ifupdownflags diff --git a/ifupdown2/ifupdown/argv.py b/ifupdown2/ifupdown/argv.py index 488338a..b4a2541 100644 --- a/ifupdown2/ifupdown/argv.py +++ b/ifupdown2/ifupdown/argv.py @@ -13,7 +13,7 @@ import argcomplete try: from ifupdown2.ifupdown.utils import utils from ifupdown2.ifupdown.exceptions import ArgvParseError, ArgvParseHelp -except: +except (ImportError, ModuleNotFoundError): from ifupdown.utils import utils from ifupdown.exceptions import ArgvParseError, ArgvParseHelp diff --git a/ifupdown2/ifupdown/client.py b/ifupdown2/ifupdown/client.py index 1c5a8d8..692d10b 100644 --- a/ifupdown2/ifupdown/client.py +++ b/ifupdown2/ifupdown/client.py @@ -44,7 +44,7 @@ try: from ifupdown2.lib.exceptions import ExitWithStatus, ExitWithStatusAndError from ifupdown2.ifupdown.argv import Parse -except: +except (ImportError, ModuleNotFoundError): from lib.status import Status from lib.io import SocketIO from lib.log import LogManager, root_logger diff --git a/ifupdown2/ifupdown/ifupdownmain.py b/ifupdown2/ifupdown/ifupdownmain.py index 1adb97a..a51d97f 100644 --- a/ifupdown2/ifupdown/ifupdownmain.py +++ b/ifupdown2/ifupdown/ifupdownmain.py @@ -33,7 +33,7 @@ try: from ifupdown2.ifupdown.exceptions import * from ifupdown2.ifupdown.networkinterfaces import * from ifupdown2.ifupdown.config import ADDON_MODULES_DIR, ADDONS_CONF_PATH, IFUPDOWN2_ADDON_DROPIN_FOLDER -except ImportError: +except (ImportError, ModuleNotFoundError): import lib.nlcache as nlcache import ifupdownaddons.mstpctlutil diff --git a/ifupdown2/ifupdown/main.py b/ifupdown2/ifupdown/main.py index 493634c..70caa34 100644 --- a/ifupdown2/ifupdown/main.py +++ b/ifupdown2/ifupdown/main.py @@ -21,7 +21,7 @@ try: from ifupdown2.lib.dry_run import DryRunManager -except ImportError: +except (ImportError, ModuleNotFoundError): from ifupdown.argv import Parse from ifupdown.config import IFUPDOWN2_CONF_PATH from ifupdown.ifupdownmain import ifupdownMain diff --git a/ifupdown2/ifupdown/networkinterfaces.py b/ifupdown2/ifupdown/networkinterfaces.py index 2d9a1a5..c87f6d6 100644 --- a/ifupdown2/ifupdown/networkinterfaces.py +++ b/ifupdown2/ifupdown/networkinterfaces.py @@ -17,7 +17,7 @@ try: from ifupdown2.ifupdown.iface import * from ifupdown2.ifupdown.utils import utils from ifupdown2.ifupdown.template import templateEngine -except ImportError: +except (ImportError, ModuleNotFoundError): from ifupdown.iface import * from ifupdown.utils import utils from ifupdown.template import templateEngine diff --git a/ifupdown2/ifupdown/scheduler.py b/ifupdown2/ifupdown/scheduler.py index c5d23b0..0f89832 100644 --- a/ifupdown2/ifupdown/scheduler.py +++ b/ifupdown2/ifupdown/scheduler.py @@ -18,7 +18,7 @@ try: import ifupdown2.ifupdown.policymanager as policymanager import ifupdown2.ifupdown.ifupdownflags as ifupdownflags -except ImportError: +except (ImportError, ModuleNotFoundError): from ifupdown.graph import * from ifupdown.iface import * from ifupdown.utils import utils diff --git a/ifupdown2/ifupdown/statemanager.py b/ifupdown2/ifupdown/statemanager.py index 00678db..62b0148 100644 --- a/ifupdown2/ifupdown/statemanager.py +++ b/ifupdown2/ifupdown/statemanager.py @@ -16,7 +16,7 @@ try: import ifupdown2.ifupdown.exceptions as exceptions import ifupdown2.ifupdown.ifupdownconfig as ifupdownConfig -except ImportError: +except (ImportError, ModuleNotFoundError): from ifupdown.iface import * import ifupdown.exceptions as exceptions diff --git a/ifupdown2/ifupdown/template.py b/ifupdown2/ifupdown/template.py index 648f6a8..ca9dc2e 100644 --- a/ifupdown2/ifupdown/template.py +++ b/ifupdown2/ifupdown/template.py @@ -9,7 +9,7 @@ try: from ifupdown2.ifupdown.utils import * -except ImportError: +except (ImportError, ModuleNotFoundError): from ifupdown.utils import * diff --git a/ifupdown2/ifupdown/utils.py b/ifupdown2/ifupdown/utils.py index cd67a94..e519636 100644 --- a/ifupdown2/ifupdown/utils.py +++ b/ifupdown2/ifupdown/utils.py @@ -23,7 +23,7 @@ try: import ifupdown2.ifupdown.policymanager as policymanager import ifupdown2.ifupdown.ifupdownflags as ifupdownflags -except ImportError: +except (ImportError, ModuleNotFoundError): from ifupdown.iface import * import ifupdown.policymanager as policymanager diff --git a/ifupdown2/ifupdownaddons/dhclient.py b/ifupdown2/ifupdownaddons/dhclient.py index 7b0aaa8..c6c51a0 100644 --- a/ifupdown2/ifupdownaddons/dhclient.py +++ b/ifupdown2/ifupdownaddons/dhclient.py @@ -10,7 +10,7 @@ import errno try: from ifupdown2.ifupdown.utils import utils from ifupdown2.ifupdownaddons.utilsbase import * -except ImportError: +except (ImportError, ModuleNotFoundError): from ifupdown.utils import utils from ifupdownaddons.utilsbase import * diff --git a/ifupdown2/ifupdownaddons/modulebase.py b/ifupdown2/ifupdownaddons/modulebase.py index c2adcc8..a6f463b 100644 --- a/ifupdown2/ifupdownaddons/modulebase.py +++ b/ifupdown2/ifupdownaddons/modulebase.py @@ -17,7 +17,7 @@ try: import ifupdown2.ifupdown.exceptions as exceptions import ifupdown2.ifupdown.policymanager as policymanager import ifupdown2.ifupdown.ifupdownflags as ifupdownflags -except ImportError: +except (ImportError, ModuleNotFoundError): from ifupdown.iface import * from ifupdown.utils import utils diff --git a/ifupdown2/ifupdownaddons/mstpctlutil.py b/ifupdown2/ifupdownaddons/mstpctlutil.py index ecd2b59..9424fc1 100644 --- a/ifupdown2/ifupdownaddons/mstpctlutil.py +++ b/ifupdown2/ifupdownaddons/mstpctlutil.py @@ -10,7 +10,7 @@ try: from ifupdown2.ifupdownaddons.cache import * from ifupdown2.ifupdownaddons.utilsbase import * -except ImportError: +except (ImportError, ModuleNotFoundError): from ifupdown.iface import * from ifupdown.utils import utils diff --git a/ifupdown2/ifupdownaddons/systemutils.py b/ifupdown2/ifupdownaddons/systemutils.py index 2e3469a..505efdd 100644 --- a/ifupdown2/ifupdownaddons/systemutils.py +++ b/ifupdown2/ifupdownaddons/systemutils.py @@ -9,7 +9,7 @@ import os try: from ifupdown2.ifupdown.utils import utils from ifupdown2.ifupdownaddons.utilsbase import * -except ImportError: +except (ImportError, ModuleNotFoundError): from ifupdown.utils import utils from ifupdownaddons.utilsbase import * diff --git a/ifupdown2/ifupdownaddons/utilsbase.py b/ifupdown2/ifupdownaddons/utilsbase.py index da38d95..9480aec 100644 --- a/ifupdown2/ifupdownaddons/utilsbase.py +++ b/ifupdown2/ifupdownaddons/utilsbase.py @@ -13,7 +13,7 @@ try: from ifupdown2.ifupdownaddons.cache import * import ifupdown2.ifupdown.ifupdownflags as ifupdownflags -except ImportError: +except (ImportError, ModuleNotFoundError): from ifupdown.iface import * from ifupdown.utils import utils from ifupdownaddons.cache import * diff --git a/ifupdown2/lib/addon.py b/ifupdown2/lib/addon.py index 12c5020..b4e258e 100644 --- a/ifupdown2/lib/addon.py +++ b/ifupdown2/lib/addon.py @@ -29,7 +29,7 @@ try: from ifupdown2.lib.sysfs import Sysfs from ifupdown2.lib.iproute2 import IPRoute2 from ifupdown2.lib.base_objects import Netlink, Cache, Requirements -except ImportError: +except (ImportError, ModuleNotFoundError): from lib.io import IO from lib.sysfs import Sysfs from lib.iproute2 import IPRoute2 diff --git a/ifupdown2/lib/base_objects.py b/ifupdown2/lib/base_objects.py index 786edc5..0c8313e 100644 --- a/ifupdown2/lib/base_objects.py +++ b/ifupdown2/lib/base_objects.py @@ -28,7 +28,7 @@ import logging try: from ifupdown2.lib.dry_run import DryRun from ifupdown2.ifupdown.utils import utils -except ImportError: +except (ImportError, ModuleNotFoundError): from lib.dry_run import DryRun from ifupdown.utils import utils diff --git a/ifupdown2/lib/io.py b/ifupdown2/lib/io.py index 3086ea8..c6ca443 100644 --- a/ifupdown2/lib/io.py +++ b/ifupdown2/lib/io.py @@ -29,7 +29,7 @@ import select try: from ifupdown2.lib.base_objects import BaseObject -except ImportError: +except (ImportError, ModuleNotFoundError): from lib.base_objects import BaseObject diff --git a/ifupdown2/lib/iproute2.py b/ifupdown2/lib/iproute2.py index 80db9d0..89d13c5 100644 --- a/ifupdown2/lib/iproute2.py +++ b/ifupdown2/lib/iproute2.py @@ -36,7 +36,7 @@ try: from ifupdown2.ifupdown.utils import utils from ifupdown2.ifupdown.iface import ifaceLinkPrivFlags from ifupdown2.nlmanager.nlpacket import Link -except ImportError: +except (ImportError, ModuleNotFoundError): from lib.sysfs import Sysfs from lib.base_objects import Cache, Requirements diff --git a/ifupdown2/lib/nlcache.py b/ifupdown2/lib/nlcache.py index 495bef4..26a9fa3 100644 --- a/ifupdown2/lib/nlcache.py +++ b/ifupdown2/lib/nlcache.py @@ -66,7 +66,7 @@ try: import ifupdown2.nlmanager.nllistener as nllistener import ifupdown2.nlmanager.nlmanager as nlmanager import ifupdown2.ifupdown.statemanager as statemanager -except: +except (ImportError, ModuleNotFoundError): from lib.sysfs import Sysfs from lib.base_objects import BaseObject diff --git a/ifupdown2/lib/sysfs.py b/ifupdown2/lib/sysfs.py index 90501a8..d56a26f 100644 --- a/ifupdown2/lib/sysfs.py +++ b/ifupdown2/lib/sysfs.py @@ -32,7 +32,7 @@ try: from ifupdown2.ifupdown.utils import utils from ifupdown2.nlmanager.nlpacket import Link -except ImportError: +except (ImportError, ModuleNotFoundError): from lib.io import IO from lib.base_objects import Requirements