jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634832 )
Change subject: [IMPR] remove callback param from fetch and simplify
......................................................................
[IMPR] remove callback param from fetch and simplify
Remove callback parameter from fetch().
All callbacks shall be added in callbacks param.
Simplify code complexity of user_agent().
Change-Id: I9ba258672aa86984bd61da218e85548164cfc41b
---
M pywikibot/comms/http.py
1 file changed, 18 insertions(+), 18 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py
index fc201d7..e1d28b0 100644
--- a/pywikibot/comms/http.py
+++ b/pywikibot/comms/http.py
@@ -153,6 +153,12 @@
username = ''
if config.user_agent_description:
script_comments.append(config.user_agent_description)
+
+ values['family'] = ''
+ values['code'] = ''
+ values['lang'] = '' # TODO: use site.lang, if known
+ values['site'] = ''
+
if site:
script_comments.append(str(site))
@@ -160,20 +166,19 @@
# is not the best for a HTTP header if the username isn't ASCII.
if site.username():
username = user_agent_username(site.username())
- script_comments.append(
- 'User:' + username)
+ script_comments.append('User:' + username)
- values.update({
- 'family': site.family.name if site else '',
- 'code': site.code if site else '',
- 'lang': site.code if site else '', # TODO: use site.lang, if known
- 'site': str(site) if site else '',
- 'username': username,
- 'script_comments': '; '.join(script_comments)
- })
+ values.update({
+ 'family': site.family.name,
+ 'code': site.code,
+ 'lang': site.code, # TODO: use site.lang, if known
+ 'site': str(site),
+ })
- if not format_string:
- format_string = config.user_agent_format
+ values['username'] = username
+ values['script_comments'] = '; '.join(script_comments)
+
+ format_string = format_string or config.user_agent_format
formatted = _USER_AGENT_FORMATTER.format(format_string, **values)
# clean up after any blank components
@@ -410,6 +415,7 @@
return request
+@deprecate_arg('callback', True)
def fetch(uri, method='GET', params=None, body=None, headers=None,
default_error_handling: bool = True,
use_fake_user_agent: Union[bool, str] = False,
@@ -430,8 +436,6 @@
@type charset: CodecInfo, str, None
@kwarg disable_ssl_certificate_validation: diable SSL Verification
@type disable_ssl_certificate_validation: bool
- @kwarg callback: Method to call once data is fetched
- @type callback: callable
@kwarg callbacks: Methods to call once data is fetched
@type callbacks: list of callable
@rtype: L{threadedhttp.HttpRequest}
@@ -463,10 +467,6 @@
headers['user-agent'] = fake_user_agent()
callbacks = kwargs.pop('callbacks', [])
- callback = kwargs.pop('callback', None)
- if callback:
- callbacks.append(callback)
-
if default_error_handling:
callbacks.append(error_handling_callback)
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634832
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I9ba258672aa86984bd61da218e85548164cfc41b
Gerrit-Change-Number: 634832
Gerrit-PatchSet: 3
Gerrit-Owner: Mpaa <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
_______________________________________________
Pywikibot-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits
