jenkins-bot merged this change.
[IMPR] Import only what is needed for requests
Change-Id: Ifd65b18d4c76e25131932575e3e9fca31e7ecc86
---
M pywikibot/comms/eventstreams.py
M pywikibot/proofreadpage.py
M pywikibot/site_detect.py
M scripts/reflinks.py
M tests/weblinkchecker_tests.py
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pywikibot/comms/eventstreams.py b/pywikibot/comms/eventstreams.py
index 668c9b0..5af1c49 100644
--- a/pywikibot/comms/eventstreams.py
+++ b/pywikibot/comms/eventstreams.py
@@ -21,7 +21,7 @@
import json
import socket
-import requests
+from requests import __version__ as requests_version
from requests.packages.urllib3.exceptions import ProtocolError
from requests.packages.urllib3.response import httplib
@@ -33,7 +33,7 @@
from pywikibot import config, debug, Timestamp, Site, warning
from pywikibot.tools import deprecated_args, StringTypes
-if LooseVersion(requests.__version__) < LooseVersion('2.20.1'):
+if LooseVersion(requests_version) < LooseVersion('2.20.1'):
raise ImportError(
'requests >= 2.20.1 is required for EventStreams;\n'
"install it with 'pip install \"requests>=2.20.1\"'\n")
diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py
index 662cba0..ffbced8 100644
--- a/pywikibot/proofreadpage.py
+++ b/pywikibot/proofreadpage.py
@@ -31,7 +31,7 @@
from functools import partial
import json
import re
-import requests
+from requests.exceptions import ReadTimeout
import time
try:
@@ -604,7 +604,7 @@
_logger)
try:
response = http.fetch(cmd_uri)
- except requests.exceptions.ReadTimeout as e:
+ except ReadTimeout as e:
timeout = e
pywikibot.warning('ReadTimeout %s: %s' % (cmd_uri, e))
except Exception as e:
diff --git a/pywikibot/site_detect.py b/pywikibot/site_detect.py
index f7063a0..bf1d231 100644
--- a/pywikibot/site_detect.py
+++ b/pywikibot/site_detect.py
@@ -10,7 +10,7 @@
import json
import re
-from requests import RequestException
+from requests.exceptions import RequestException
import pywikibot
diff --git a/scripts/reflinks.py b/scripts/reflinks.py
index 85c0205..d906ad5 100755
--- a/scripts/reflinks.py
+++ b/scripts/reflinks.py
@@ -63,7 +63,7 @@
)
from pywikibot.tools.formatter import color_format, PY2
-import requests
+from requests import codes
from scripts import noreferences
@@ -589,7 +589,7 @@
'Redirect to root : {0} ', ref.link))
continue
- if f.status != requests.codes.ok:
+ if f.status != codes.ok:
pywikibot.output('HTTP error ({0}) for {1} on {2}'
.format(f.status, ref.url,
page.title(as_link=True)),
diff --git a/tests/weblinkchecker_tests.py b/tests/weblinkchecker_tests.py
index 53440f6..2400fda 100644
--- a/tests/weblinkchecker_tests.py
+++ b/tests/weblinkchecker_tests.py
@@ -9,7 +9,7 @@
import datetime
-from requests import ConnectionError as RequestsConnectionError
+from requests.exceptions import ConnectionError as RequestsConnectionError
from pywikibot.tools import PY2
from scripts import weblinkchecker
To view, visit change 588147. To unsubscribe, or for help writing mail filters, visit settings.