jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/575693 )
Change subject: [IMPR] Directly import UserAgent from fake-useragent
......................................................................
[IMPR] Directly import UserAgent from fake-useragent
Also simplify the deprecated get_fake_user_agent function.
Change-Id: Ic3f1d6ae9edc1a428af629943d18c6e3a7e05e19
---
M pywikibot/comms/http.py
1 file changed, 5 insertions(+), 6 deletions(-)
Approvals:
Dvorapa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py
index b95eadd..e09f880 100644
--- a/pywikibot/comms/http.py
+++ b/pywikibot/comms/http.py
@@ -12,7 +12,7 @@
- Basic HTTP error handling
"""
#
-# (C) Pywikibot team, 2007-2019
+# (C) Pywikibot team, 2007-2020
#
# Distributed under the terms of the MIT license.
#
@@ -244,10 +244,9 @@
"""
if isinstance(config.fake_user_agent, StringTypes):
return config.fake_user_agent
- elif config.fake_user_agent or config.fake_user_agent is None:
- return fake_user_agent()
- else:
+ if config.fake_user_agent is False:
return user_agent()
+ return fake_user_agent()
def fake_user_agent():
@@ -257,11 +256,11 @@
@rtype: str
"""
try:
- import fake_useragent
- return fake_useragent.fake.UserAgent().random
+ from fake_useragent import UserAgent
except ImportError:
raise ImportError( # Actually complain when fake_useragent is missing.
'fake_useragent must be installed to get fake UAs.')
+ return UserAgent().random
@deprecate_arg('ssl', None)
--
To view, visit
https://gerrit.wikimedia.org/r/575693
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: Ic3f1d6ae9edc1a428af629943d18c6e3a7e05e19
Gerrit-Change-Number: 575693
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: jenkins-bot (75)