jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/804699 )
Change subject: [fix] Do not show a warning if generator is specified later
......................................................................
[fix] Do not show a warning if generator is specified later
Bug: T310418
Change-Id: I4c2958fc0b43de5dbe1e9deb57ce770f2d421fe8
---
M scripts/harvest_template.py
1 file changed, 2 insertions(+), 3 deletions(-)
Approvals:
JJMC89: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/harvest_template.py b/scripts/harvest_template.py
index f6b778b..04cd5df 100755
--- a/scripts/harvest_template.py
+++ b/scripts/harvest_template.py
@@ -423,10 +423,9 @@
'Please specify either -template or -transcludes argument')
return
- generator = gen.getCombinedGenerator(preload=True)
- if not generator:
+ if not gen.gens:
gen.handle_arg('-transcludes:' + template_title)
- generator = gen.getCombinedGenerator(preload=True)
+ generator = gen.getCombinedGenerator(preload=True)
bot = HarvestRobot(template_title, fields, generator=generator, **options)
bot.run()
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/804699
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: I4c2958fc0b43de5dbe1e9deb57ce770f2d421fe8
Gerrit-Change-Number: 804699
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com>
Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/805170 )
Change subject: Fix spelling mistake
......................................................................
Fix spelling mistake
Change-Id: Id896174294644f6b9e1303e6903b7f8af507e221
---
M pywikibot/page/_pages.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
DannyS712: Looks good to me, but someone else must approve
JJMC89: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/page/_pages.py b/pywikibot/page/_pages.py
index 96b0309..2021b09 100644
--- a/pywikibot/page/_pages.py
+++ b/pywikibot/page/_pages.py
@@ -7,7 +7,7 @@
- Category: A page in the Category: namespace
Various Wikibase pages are defined in ``page._wikibase.py``,
-various pages for Proofread Extensions are defines in
+various pages for Proofread Extensions are defined in
``pywikibot.proofreadpage``.
..note:: `Link` objects represent a wiki-page's title, while
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/805170
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: Id896174294644f6b9e1303e6903b7f8af507e221
Gerrit-Change-Number: 805170
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: DannyS712 <dannys712.wiki(a)gmail.com>
Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/804761 )
Change subject: [doc] Add references within ROADMAP.rst
......................................................................
[doc] Add references within ROADMAP.rst
- Add some references within ROADMAP.rst
- fix :phab: patterns
- remove pywikibot_fix_phab_tasks function for sphinx because there is no
remaining task without extlink pattern
- remove pywikibot_skip_members function for sphinx because sphinx
directives should be used instead and inclusions/exclusions are
already empty
- update pattern in setup.py to remove sphinx directives
- add sample code in _filepage.py and bot.py
Change-Id: I693000d06eaa396ffe847b2b8c77eeef572538ae
---
M ROADMAP.rst
M docs/conf.py
M pwb.py
M pywikibot/__init__.py
M pywikibot/bot.py
M pywikibot/exceptions.py
M pywikibot/page/_filepage.py
M pywikibot/proofreadpage.py
M setup.py
9 files changed, 32 insertions(+), 39 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ROADMAP.rst b/ROADMAP.rst
index 08c641a..1bedb6a 100644
--- a/ROADMAP.rst
+++ b/ROADMAP.rst
@@ -5,17 +5,17 @@
* Show an APIError if PetScanPageGenerator.query() fails (:phab:`T309538`)
* `login.py` is now a utiliy script even for site-package installation (:phab:`T309290`)
* `preload_sites.py` is now a utiliy script even for site-package installation (:phab:`T308912`)
-* `generator_completed` became a public attribute
+* :attr:`generator_completed<pywikibot.bot.BaseBot.generator_completed>` became a public attribute
* Return gracefully from pwb.find_alternates if folder in user_script_paths does not exist (:phab:`T308910`)
Deprecations
^^^^^^^^^^^^
-* 7.4.0: `FilePage.usingPages()` was renamed to `using_pages()`
-* 7.2.0: ``tb`` parameter of ``exception()`` function was renamed to ``exc_info``
-* 7.2.0: XMLDumpOldPageGenerator is deprecated in favour of a `content` parameter (:phab:`T306134`)
-* 7.2.0: RedirectPageBot and NoRedirectPageBot bot classes are deprecated in favour of `use_redirects` attribute
-* 7.2.0: `tools.formatter.color_format` is deprecated and will be removed
+* 7.4.0: `FilePage.usingPages()` was renamed to :meth:`using_pages()<pywikibot.FilePage.using_pages>`
+* 7.2.0: ``tb`` parameter of :func:`exception()<pywikibot.exception>` function was renamed to ``exc_info``
+* 7.2.0: XMLDumpOldPageGenerator is deprecated in favour of a `content` parameter of `XMLDumpPageGenerator` (:phab:`T306134`)
+* 7.2.0: RedirectPageBot and NoRedirectPageBot bot classes are deprecated in favour of :attr:`use_redirects<pywikibot.bot.BaseBot.use_redirects>` attribute
+* 7.2.0: :func:`tools.formatter.color_format<pywikibot.tools.formatter.color_format>` is deprecated and will be removed
* 7.1.0: Unused `get_redirect` parameter of Page.getOldVersion() will be removed
* 7.1.0: APISite._simple_request() will be removed in favour of APISite.simple_request()
* 7.0.0: User.isBlocked() method is renamed to is_blocked for consistency
diff --git a/docs/conf.py b/docs/conf.py
index 441a7dd..d8298d9 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -381,15 +381,6 @@
}
-def pywikibot_fix_phab_tasks(app, what, name, obj, options, lines):
- """Convert Phabricator tasks id to a link using sphinx.ext.extlinks."""
- result = []
- for line in lines:
- line = re.sub(r'(?<!:phab:`)(T\d{5,6})', r':phab:`\1`', line)
- result.append(line)
- lines[:] = result[:]
-
-
def pywikibot_docstring_fixups(app, what, name, obj, options, lines):
"""Fixup docstrings."""
if what not in ('class', 'exception'):
@@ -445,20 +436,6 @@
length = 0
-def pywikibot_skip_members(app, what, name, obj, skip, options):
- """Skip certain members from documentation."""
- inclusions = ()
- exclusions = ()
- if name in inclusions and len(str.splitlines(obj.__doc__ or '')) >= 3:
- return False
- if name.startswith('__') and name.endswith('__'):
- return True
- if obj.__doc__ is not None \
- and ('DEPRECATED' in obj.__doc__ or 'Deprecated' in obj.__doc__):
- return True
- return skip or name in exclusions
-
-
def pywikibot_family_classproperty_getattr(obj, name, *defargs):
"""Custom getattr() to get classproperty instances."""
from sphinx.util.inspect import safe_getattr
@@ -485,10 +462,8 @@
def setup(app):
"""Implicit Sphinx extension hook."""
- app.connect('autodoc-process-docstring', pywikibot_fix_phab_tasks)
app.connect('autodoc-process-docstring', pywikibot_docstring_fixups)
app.connect('autodoc-process-docstring', pywikibot_script_docstring_fixups)
- app.connect('autodoc-skip-member', pywikibot_skip_members)
app.add_autodoc_attrgetter(type, pywikibot_family_classproperty_getattr)
diff --git a/pwb.py b/pwb.py
index 730bad8..2c9a9a6 100755
--- a/pwb.py
+++ b/pwb.py
@@ -27,7 +27,7 @@
will fix up search paths so the package does not need to be installed, etc.
Currently, `<pwb options>` are :ref:`global options`. This can be used
-for tests to set the default site (see T216825)::
+for tests to set the default site (see :phab:`T216825`)::
python pwb.py -lang:de bot_tests -v
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index e6231e6..3264486 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -846,7 +846,7 @@
"""
A Wikibase representation for data pages.
- A temporary implementation until T162336 has been resolved.
+ A temporary implementation until :phab:`T162336` has been resolved.
Note that this class cannot be used directly
"""
diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index ebe226b..3d6fb8b 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -1247,7 +1247,16 @@
use_redirects = None # type: Optional[bool]
"""Attribute to determine whether to use redirect pages. Set it to
True to use redirects only, set it to False to skip redirects. If
- None both are processed.
+ None both are processed. For example to create a RedirectBot you may
+ define:
+
+ .. code-block:: python
+
+ class MyRedirectBot(ExistingPageBot):
+
+ '''Bot who only works on existing redirects.'''
+
+ use_redirects = True
.. versionadded:: 7.2
"""
diff --git a/pywikibot/exceptions.py b/pywikibot/exceptions.py
index 8fd93ab..2e2df94 100644
--- a/pywikibot/exceptions.py
+++ b/pywikibot/exceptions.py
@@ -447,7 +447,7 @@
"""
Page is a redirect to another site.
- This is considered invalid in Pywikibot. See bug T75184.
+ This is considered invalid in Pywikibot. See bug :phab:`T75184`.
"""
diff --git a/pywikibot/page/_filepage.py b/pywikibot/page/_filepage.py
index 7cc6b58..32fcf9f 100644
--- a/pywikibot/page/_filepage.py
+++ b/pywikibot/page/_filepage.py
@@ -182,6 +182,16 @@
:meth:`APISite.imageusage()
<pywikibot.site._generators.GeneratorsMixin.imageusage>`
+ Usage example:
+
+ >>> site = pywikibot.Site('wikipedia:test')
+ >>> file = pywikibot.FilePage(site, 'Pywikibot MW gear icon.svg')
+ >>> used = list(file.using_pages(total=10))
+ >>> len(used)
+ 1
+ >>> used[0].title()
+ 'Pywikibot'
+
.. seealso:: :meth:`globalusage`
.. versionchanged:: 7.2
all parameters from :meth:`APISite.imageusage()
diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py
index eea8edd..2f98b6c 100644
--- a/pywikibot/proofreadpage.py
+++ b/pywikibot/proofreadpage.py
@@ -771,9 +771,8 @@
"""Subclass of Request which skips the check on write rights.
- Workaround for T128994.
- # TODO: remove once bug is fixed.
- """
+ Workaround for :phab:`T128994`.
+ """ # TODO: remove once bug is fixed.
def __init__(self, **kwargs: Any) -> None:
"""Monkeypatch action in Request initializer."""
diff --git a/setup.py b/setup.py
index d5f3fcf..37d59dc 100755
--- a/setup.py
+++ b/setup.py
@@ -208,7 +208,7 @@
Combine included restructured text files which must be done before
uploading because the source isn't available after creating the package.
"""
- pattern = r'\:phab\:`(T\d+)`', r'\1'
+ pattern = r'\:\w+\:`([^`]+?)(?:<.+>)?`', r'\1'
desc = []
with open(filename) as f:
for line in f:
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/804761
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: I693000d06eaa396ffe847b2b8c77eeef572538ae
Gerrit-Change-Number: 804761
Gerrit-PatchSet: 4
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/804749 )
Change subject: [fix] Use locale.getlocale to get the default userinterface_lang
......................................................................
[fix] Use locale.getlocale to get the default userinterface_lang
locale.getdefaultlocale() is deprecated since Python 3.11. Use
locale.getlocale() istead.
Bug: T310432
Change-Id: Ia6eb01f4571943610ec574612aa051473a31c68d
---
M pywikibot/config.py
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/config.py b/pywikibot/config.py
index 26ca728..173ff93 100644
--- a/pywikibot/config.py
+++ b/pywikibot/config.py
@@ -41,7 +41,7 @@
import stat
import sys
import types
-from locale import getdefaultlocale
+from locale import getlocale
from os import environ, getenv
from pathlib import Path
from textwrap import fill
@@ -497,7 +497,7 @@
userinterface_init_kwargs = {} # type: Dict[str, str]
# i18n setting for user interface language
-# default is obtained from :py:obj:`locale.getdefaultlocale`
+# default is obtained from locale.getlocale
userinterface_lang = None
# Should we transliterate characters that do not exist in the console
@@ -1095,7 +1095,7 @@
if userinterface_lang is None:
userinterface_lang = os.getenv('PYWIKIBOT_USERINTERFACE_LANG') \
- or getdefaultlocale()[0]
+ or getlocale()[0]
if userinterface_lang is None or userinterface_lang == 'C':
userinterface_lang = 'en'
else:
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/804749
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: Ia6eb01f4571943610ec574612aa051473a31c68d
Gerrit-Change-Number: 804749
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/803289 )
Change subject: [doc] update ROADMAP.rst and CHANGELOG.md
......................................................................
[doc] update ROADMAP.rst and CHANGELOG.md
Change-Id: I9764e502886d5bf2cb7363108f4914b86a79766d
---
M ROADMAP.rst
M scripts/CHANGELOG.md
2 files changed, 16 insertions(+), 0 deletions(-)
Approvals:
Xqt: Verified; Looks good to me, approved
diff --git a/ROADMAP.rst b/ROADMAP.rst
index 3e9a9b5..08c641a 100644
--- a/ROADMAP.rst
+++ b/ROADMAP.rst
@@ -1,6 +1,11 @@
Current release 7.4.0
^^^^^^^^^^^^^^^^^^^^^
+* Use Response.json() instead of json.loads(Response.text)
+* Show an APIError if PetScanPageGenerator.query() fails (:phab:`T309538`)
+* `login.py` is now a utiliy script even for site-package installation (:phab:`T309290`)
+* `preload_sites.py` is now a utiliy script even for site-package installation (:phab:`T308912`)
+* `generator_completed` became a public attribute
* Return gracefully from pwb.find_alternates if folder in user_script_paths does not exist (:phab:`T308910`)
Deprecations
diff --git a/scripts/CHANGELOG.md b/scripts/CHANGELOG.md
index 783d5e5..a374d67 100644
--- a/scripts/CHANGELOG.md
+++ b/scripts/CHANGELOG.md
@@ -1,5 +1,16 @@
# Scripts Changelog
+## 7.4.0
+*current release*
+
+### listpages
+* Print the page list immediately except pages are preloaded
+
+### nowcommons
+* Use treat_page method (:phab:`T309456`)
+* Fix several bugs (:phab:`T309473`)
+
+
## 7.3.0
*21 May 2022*
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/803289
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: I9764e502886d5bf2cb7363108f4914b86a79766d
Gerrit-Change-Number: 803289
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-MessageType: merged
jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/801629 )
Change subject: [IMPR] Move submitting while loop into submit() method
......................................................................
[IMPR] Move submitting while loop into submit() method
- Move submitting while loop into submit() method to decrease code
complexity from 31 to 19
- upload_warnings becomes a class attribute
- move warning_keys to submit method
Change-Id: I8d4e91def8ba9ff357d32a1bb7447de85a726da7
---
M pywikibot/site/_upload.py
1 file changed, 61 insertions(+), 50 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/site/_upload.py b/pywikibot/site/_upload.py
index c3391c7..9a4bc3d 100644
--- a/pywikibot/site/_upload.py
+++ b/pywikibot/site/_upload.py
@@ -62,6 +62,30 @@
otherwise. If it's True or None ignore_warnings must be a bool.
"""
+ upload_warnings = {
+ # map API warning codes to user error messages
+ # {msg} will be replaced by message string from API response
+ 'duplicate-archive':
+ 'The file is a duplicate of a deleted file {msg}.',
+ 'was-deleted': 'The file {msg} was previously deleted.',
+ 'empty-file': 'File {msg} is empty.',
+ 'exists': 'File {msg} already exists.',
+ 'duplicate': 'Uploaded file is a duplicate of {msg}.',
+ 'badfilename': 'Target filename is invalid.',
+ 'filetype-unwanted-type': 'File {msg} type is unwanted type.',
+ 'exists-normalized':
+ 'File exists with different extension as {msg!r}.',
+ 'bad-prefix': 'Target filename has a bad prefix {msg}.',
+ 'page-exists':
+ 'Target filename exists but with a different file {msg}.',
+
+ # API-returned message string will be timestamps, not much use here
+ 'no-change': 'The upload is an exact duplicate of the current version '
+ 'of this file.',
+ 'duplicate-version': 'The upload is an exact duplicate of older '
+ 'version(s) of this file.',
+ }
+
def __init__(self,
site: 'pywikibot.site.APISite',
filepage: 'pywikibot.FilePage',
@@ -111,6 +135,16 @@
return self._upload(self.ignore_warnings, self.report_success)
+ @classmethod
+ def create_warnings_list(cls, response, file_key):
+ """Create a list of upload errors."""
+ return [UploadError(warning,
+ cls.upload_warnings.get(warning, '{msg}')
+ .format(msg=data),
+ file_key,
+ response['offset'])
+ for warning, data in response['warnings'].items()]
+
def _upload(self, ignore_warnings, report_success,
file_key=None, offset=0) -> bool:
"""Recursive Upload method.
@@ -124,46 +158,6 @@
default starts at 0.
:return: Whether the upload was successful.
"""
-
- def create_warnings_list(response):
- return [
- UploadError(
- warning,
- upload_warnings.get(warning, '{msg}').format(msg=data),
- file_key, response['offset'])
- for warning, data in response['warnings'].items()]
-
- # some warning keys have been changed
- warning_keys = {
- 'nochange': 'no-change',
- 'duplicateversions': 'duplicate-version',
- 'emptyfile': 'empty-file',
- }
-
- upload_warnings = {
- # map API warning codes to user error messages
- # {msg} will be replaced by message string from API response
- 'duplicate-archive':
- 'The file is a duplicate of a deleted file {msg}.',
- 'was-deleted': 'The file {msg} was previously deleted.',
- 'empty-file': 'File {msg} is empty.',
- 'exists': 'File {msg} already exists.',
- 'duplicate': 'Uploaded file is a duplicate of {msg}.',
- 'badfilename': 'Target filename is invalid.',
- 'filetype-unwanted-type': 'File {msg} type is unwanted type.',
- 'exists-normalized': 'File exists with different extension as '
- '"{msg}".',
- 'bad-prefix': 'Target filename has a bad prefix {msg}.',
- 'page-exists':
- 'Target filename exists but with a different file {msg}.',
-
- # API-returned message string will be timestamps, not much use here
- 'no-change': 'The upload is an exact duplicate of the current '
- 'version of this file.',
- 'duplicate-version': 'The upload is an exact duplicate of older '
- 'version(s) of this file.',
- }
-
# An offset != 0 doesn't make sense without a file key
assert(offset == 0 or file_key is not None)
@@ -375,7 +369,8 @@
# T112416 and T112405#1637544
restart = True
data['offset'] = True
- if ignore_warnings(create_warnings_list(data)):
+ if ignore_warnings(self.create_warnings_list(
+ data, file_key)):
# Future warnings of this run
# can be ignored
if restart:
@@ -418,8 +413,8 @@
final_request['async'] = self.asynchronous
break
else:
- raise Error(
- 'Unrecognized result: %s' % data['result'])
+ raise Error('Unrecognized result: {result}'
+ .format_map(data))
else: # not chunked upload
if file_key:
@@ -442,12 +437,27 @@
action='upload', filename=file_page_title, url=self.url,
comment=self.comment, text=self.text, token=token)
+ return self.submit(final_request, result, data['result'],
+ ignore_warnings, ignore_all_warnings,
+ report_success, file_key)
+
+ def submit(self, request, result, data_result, ignore_warnings,
+ ignore_all_warnings, report_success, file_key) -> bool:
+ """Submit request and return whether upload was successful."""
+ # some warning keys have been changed
+ warning_keys = {
+ 'nochange': 'no-change',
+ 'duplicateversions': 'duplicate-version',
+ 'emptyfile': 'empty-file',
+ }
+
+ token = request['token']
while True:
if not result:
- final_request['watch'] = self.watch
- final_request['ignorewarnings'] = ignore_all_warnings
+ request['watch'] = self.watch
+ request['ignorewarnings'] = ignore_all_warnings
try:
- result = final_request.submit()
+ result = request.submit()
self.site._uploaddisabled = False
except APIError as error:
# TODO: catch and process foreseeable errors
@@ -481,7 +491,8 @@
if not report_success:
result.setdefault('offset', bool(self.filename))
offset = result['offset'] if self.filename else False
- if ignore_warnings(create_warnings_list(result)):
+ if ignore_warnings(self.create_warnings_list(result,
+ file_key)):
return self._upload(ignore_warnings=True,
report_success=False,
file_key=file_key,
@@ -497,7 +508,7 @@
message = result['warnings'][warning]
warning = warning_keys.get(warning, warning)
raise UploadError(warning,
- upload_warnings[warning]
+ self.upload_warnings[warning]
.format(msg=message),
file_key=file_key,
offset=result.get('offset', False))
@@ -507,7 +518,7 @@
assert file_key
pywikibot.log('Waiting for upload to be published.')
result = None
- final_request = self.site.simple_request(
+ request = self.site.simple_request(
action='upload',
token=token,
filekey=file_key,
@@ -523,4 +534,4 @@
self.filepage._load_file_revisions([result['imageinfo']])
return True
- raise Error('Unrecognized result: %s' % data['result'])
+ raise Error('Unrecognized result: {}'.format(data_result))
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/801629
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: I8d4e91def8ba9ff357d32a1bb7447de85a726da7
Gerrit-Change-Number: 801629
Gerrit-PatchSet: 6
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged