jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/692476 )
Change subject: [IMPR] decrease nested flow in tools.has_module ......................................................................
[IMPR] decrease nested flow in tools.has_module
Change-Id: Ia574b0e2b4c230488274cdbbc83eb52e6c039147 --- M pywikibot/tools/__init__.py 1 file changed, 10 insertions(+), 11 deletions(-)
Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified
diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index 218cd5d..5edad9f 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -82,20 +82,19 @@ m = import_module(module) except ImportError: return False - else: - if version: - if not hasattr(m, '__version__'): - return False + if version: + if not hasattr(m, '__version__'): + return False
- required_version = pkg_resources.parse_version(version) - module_version = pkg_resources.parse_version(m.__version__) + required_version = pkg_resources.parse_version(version) + module_version = pkg_resources.parse_version(m.__version__)
- if module_version < required_version: - warn('Module version {} is lower than requested version {}' - .format(module_version, required_version), ImportWarning) - return False + if module_version < required_version: + warn('Module version {} is lower than requested version {}' + .format(module_version, required_version), ImportWarning) + return False
- return True + return True
def empty_iterator():