jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/491217 )
Change subject: [IMPR] eventstreams.py: use version.package_versions to get version
string
......................................................................
[IMPR] eventstreams.py: use version.package_versions to get version string
Change-Id: I6c8a7b0d7b094f69063aff874edd27e94ea98156
---
M pywikibot/comms/eventstreams.py
1 file changed, 5 insertions(+), 3 deletions(-)
Approvals:
Xqt: Looks good to me, approved
Dvorapa: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/pywikibot/comms/eventstreams.py b/pywikibot/comms/eventstreams.py
index 710bebd..82deeeb 100644
--- a/pywikibot/comms/eventstreams.py
+++ b/pywikibot/comms/eventstreams.py
@@ -8,7 +8,7 @@
pip install sseclient
"""
#
-# (C) xqt, 2017-2018
+# (C) xqt, 2017-2019
# (C) Pywikibot team, 2017-2019
#
# Distributed under the terms of the MIT license.
@@ -20,7 +20,6 @@
import json
import socket
-import requests
from requests.packages.urllib3.exceptions import ProtocolError
from requests.packages.urllib3.response import httplib
@@ -31,12 +30,15 @@
from pywikibot import config, debug, Timestamp, Site, warning
from pywikibot.tools import deprecated_args, StringTypes
+from pywikibot.version import package_versions
# requests >= 2.9 is required for eventstreams (T184713)
-if LooseVersion(requests.__version__) < LooseVersion('2.9'):
+data = package_versions(['requests'])
+if LooseVersion(data['requests']['ver']) <
LooseVersion('2.9'):
raise ImportError(
'requests >= 2.9 is required for EventStreams;\n'
"install it with 'pip install
\"requests>=2.20.0\"'\n")
+del data
_logger = 'pywikibot.eventstreams'
--
To view, visit
https://gerrit.wikimedia.org/r/491217
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I6c8a7b0d7b094f69063aff874edd27e94ea98156
Gerrit-Change-Number: 491217
Gerrit-PatchSet: 4
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com>
Gerrit-Reviewer: jenkins-bot (75)