jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/377944 )
Change subject: Require `future` for Python versions older than 2.7.3
......................................................................
Require `future` for Python versions older than 2.7.3
site_detect.py tries `from future.backports.html.parser import HTMLParser`.
Requiring future for older versions of Python ensures that the issues in
older versions of HTMLParser will not occure in site_detect.
Bug: T175873
Change-Id: I1c239c7abdd7e7c5e107ed30adf84ab01613f16f
---
M requirements.txt
M setup.py
2 files changed, 4 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/requirements.txt b/requirements.txt
index ddda7fc..98c9c0d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -28,7 +28,7 @@
#
https://github.com/eliben/pycparser/issues/147
pycparser != 2.14
-future>=0.15.0 ; python_version < '2.7'
+future>=0.15.0 ; python_full_version < '2.7.3'
ipaddr>=2.1.10 ; python_version < '3'
diff --git a/setup.py b/setup.py
index de64c83..6fc833c 100644
--- a/setup.py
+++ b/setup.py
@@ -133,6 +133,9 @@
# ipaddr 2.1.10+ is distributed with Debian and Fedora. See T105443.
dependencies.append('ipaddr>=2.1.10')
+ if sys.version_info < (2, 7, 3):
+ dependencies.append('future>=0.15.0') # Bug fixes for HTMLParser
+
if sys.version_info < (2, 7, 9):
# Python versions before 2.7.9 will cause urllib3 to trigger
# InsecurePlatformWarning warnings for all HTTPS requests. By
--
To view, visit
https://gerrit.wikimedia.org/r/377944
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1c239c7abdd7e7c5e107ed30adf84ab01613f16f
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot <>