jenkins-bot submitted this change.

View Change

Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified
[IMPR] decrease nested flow in tools.has_module

Change-Id: Ia574b0e2b4c230488274cdbbc83eb52e6c039147
---
M pywikibot/tools/__init__.py
1 file changed, 10 insertions(+), 11 deletions(-)

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():

To view, visit change 692476. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: Ia574b0e2b4c230488274cdbbc83eb52e6c039147
Gerrit-Change-Number: 692476
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info@gno.de>
Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia@gmail.com>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged