Pywikibot-commits November 2020

pywikibot-commits@lists.wikimedia.org

1 participants
127 discussions

[Gerrit] ...core[master]: [IMPR] reduce code complexity of pagegenerators.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/638736 ) Change subject: [IMPR] reduce code complexity of pagegenerators.py ...................................................................... [IMPR] reduce code complexity of pagegenerators.py Added also test for RedirectFilterPageGenerator. Change-Id: Ic37cb41bdf658a4d1c2ee081374017e60b381da7 --- M pywikibot/pagegenerators.py M tests/pagegenerators_tests.py 2 files changed, 31 insertions(+), 12 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index 62d10a0..2af367f 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -1622,19 +1622,17 @@ redirects. @param show_filtered: Output a message for each page not yielded """ - for page in generator or []: - if no_redirects: - if not page.isRedirectPage(): - yield page - elif show_filtered: - pywikibot.output('%s is a redirect page. Skipping.' % page) + fmt = '{page} is {what} redirect page. Skipping.' + what = 'a' if no_redirects else 'not a' - else: - if page.isRedirectPage(): - yield page - elif show_filtered: - pywikibot.output('%s is not a redirect page. Skipping.' - % page) + for page in generator or []: + is_redirect = page.isRedirectPage() + if bool(no_redirects) != bool(is_redirect): # xor + yield page + continue + + if show_filtered: + pywikibot.output(fmt.format(what=what, page=page)) class ItemClaimFilter: diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 6c5df6f..7010ee2 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -316,6 +316,27 @@ self.assertIsEmpty(list(gen)) +class RedirectFilterPageGeneratorTestCase(TestCase): + + """Test RedirectFilterPageGenerator.""" + + family = 'wikipedia' + code = 'en' + + def test_redirect_filter(self): + """Test RedirectFilterPageGenerator.""" + from pywikibot.pagegenerators import RedirectFilterPageGenerator + gf = pagegenerators.GeneratorFactory(site=self.site) + gf.handleArg('-randomredirect:3') + gf.handleArg('-page:Main_Page') + gen = gf.getCombinedGenerator() + pages = list(gen) + gen = RedirectFilterPageGenerator(pages, no_redirects=True) + self.assertLength(list(gen), 1) + gen = RedirectFilterPageGenerator(pages, no_redirects=False) + self.assertLength(list(gen), 3) + + class SubpageFilterGeneratorTestCase(TestCase): """Test SubpageFilterGenerator.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/638736 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: Ic37cb41bdf658a4d1c2ee081374017e60b381da7 Gerrit-Change-Number: 638736 Gerrit-PatchSet: 1 Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 6 months

[Gerrit] ...core[master]: Modify echo_tests.py to support Python 3.5+ only

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/638150 ) Change subject: Modify echo_tests.py to support Python 3.5+ only ...................................................................... Modify echo_tests.py to support Python 3.5+ only Bug: T257399 Change-Id: I24927c903d49a838bfc64b41b3c3c8fbc8f8b77d --- M tests/echo_tests.py 1 file changed, 3 insertions(+), 5 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/echo_tests.py b/tests/echo_tests.py index 23cb958..ce64d4e 100644 --- a/tests/echo_tests.py +++ b/tests/echo_tests.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- """Test echo module.""" # -# (C) Pywikibot team, 2019 +# (C) Pywikibot team, 2019-2020 # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals +from contextlib import suppress import pywikibot @@ -64,7 +64,5 @@ if __name__ == '__main__': # pragma: no cover - try: + with suppress(SystemExit): unittest.main() - except SystemExit: - pass -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/638150 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: I24927c903d49a838bfc64b41b3c3c8fbc8f8b77d Gerrit-Change-Number: 638150 Gerrit-PatchSet: 6 Gerrit-Owner: Shubham656jain <shubham656jain(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 6 months

[Gerrit] ...core[master]: [IMPR] use textfile for interwiki dumps

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/483939 ) Change subject: [IMPR] use textfile for interwiki dumps ...................................................................... [IMPR] use textfile for interwiki dumps Also enable -restore:all option pickle format was introduced with core branch for interwiki dumps but text format is more applicable for bot owners. Go back to the old compat format. - Introduce a new interwikidumps.py maintenance script which converts dump files from old pickle format to new txt format - All dump handling is done by the new InterwikiDumps class - remove InterwikiBot.dump() method which is no longer needed - add new InterwikiBot.dump_titles property which is a generator yielding all page titles to be dumped Bug: T74943 Bug: T213624 Change-Id: Ie7380d587aab42ace158335de4f41fe9a5709700 --- M docs/scripts/scripts.maintenance.rst M scripts/README.rst M scripts/interwiki.py A scripts/maintenance/interwikidumps.py M tox.ini 5 files changed, 245 insertions(+), 63 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/scripts/scripts.maintenance.rst b/docs/scripts/scripts.maintenance.rst index b240a49..c7e5bf9 100644 --- a/docs/scripts/scripts.maintenance.rst +++ b/docs/scripts/scripts.maintenance.rst @@ -22,6 +22,11 @@ .. automodule:: scripts.maintenance.compat2core +scripts.maintenance.interwikidumps script +----------------------------------------- + +.. automodule:: scripts.maintenance.interwikidumps + scripts.maintenance.make\_i18n\_dict script ------------------------------------------- diff --git a/scripts/README.rst b/scripts/README.rst index 5130594..c8df3da 100644 --- a/scripts/README.rst +++ b/scripts/README.rst @@ -281,6 +281,8 @@ | compat2core.py | Helper script to convert compat 1.0 scripts to the core | | | 3.0 framework. Also works for newer Pywikibot releases. | +------------------------+---------------------------------------------------------+ + | interwikidumps.py | Convert interwiki dumps from pickle to txt format. | + +------------------------+---------------------------------------------------------+ | make_i18n_dict.py | Generate a i18n file from a given script. | +------------------------+---------------------------------------------------------+ | sorting_order.py | Updates interwiki sorting order in family.py file. | diff --git a/scripts/interwiki.py b/scripts/interwiki.py index 6cf62dd..08ab1e3 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -335,7 +335,6 @@ # import codecs import os -import pickle import re import socket import sys @@ -350,7 +349,7 @@ from pywikibot import config, i18n, pagegenerators, textlib, interwiki_graph from pywikibot import titletranslate -from pywikibot.bot import ListOption, StandardOption +from pywikibot.bot import OptionHandler, ListOption, StandardOption from pywikibot.cosmetic_changes import moved_links from pywikibot.tools import first_upper from pywikibot.tools.formatter import color_format @@ -1935,26 +1934,8 @@ @property def dump_titles(self): - """Return list of titles for dump file.""" - return [s.origin.title() for s in self.subjects] - - def dump(self, append=True): - """Write dump file.""" - site = pywikibot.Site() - dumpfn = pywikibot.config.datafilepath( - 'data', - 'interwiki-dumps', - '{0}-{1}.pickle'.format(site.family.name, site.code) - ) - if append: - mode = 'appended' - else: - mode = 'written' - with open(dumpfn, mode[0] + 'b') as f: - pickle.dump(self.dump_titles, f, protocol=config.pickle_protocol) - pywikibot.output('Dump {0} ({1}) {2}.' - .format(site.code, site.family.name, mode)) - return dumpfn + """Return generator of titles for dump file.""" + return (s.origin.title(as_link=True) for s in self.subjects) def generateMore(self, number): """Generate more subjects. @@ -2264,6 +2245,141 @@ return False +class InterwikiDumps(OptionHandler): + + """Handle interwiki dumps.""" + + available_options = { + 'do_continue': False, + 'restore_all': False + } + + FILE_PATTERN = '{site.family.name}-{site.code}.txt' + + def __init__(self, **kwargs): + """Initializer. + + @keyword do_continue: If true, continue alphabetically starting at the + last of the dumped pages. + """ + self.site = kwargs.pop('site', pywikibot.Site()) + super().__init__(**kwargs) + + self.restored_files = set() + self._next_page = '!' + self._next_namespace = 0 + self.path = pywikibot.config.datafilepath('data', 'interwiki-dumps') + + @property + def next_page(self): + """Return next page title string for continue option.""" + if self._next_page == '!': + pywikibot.output('Dump file is empty! Starting at the beginning.') + return self._next_page + + @property + def next_namespace(self): + """Return next page namespace for continue option.""" + return self._next_namespace + + def remove(self, filename: str): + """Remove filename from restored files. + + @param filename: A filename to be removed from restored set. + """ + with suppress(KeyError): + self.restored_files.remove(filename) + + def get_files(self, mode='txt'): + """Get dump files from directory.""" + pattern = (r'(?P<file>\A(?P<fam>[a-z]+)-(?P<code>[a-z]+)\.{}\Z)' + .format(mode)) + for filename in os.listdir(self.path): + found = re.match(pattern, filename) + if found: + yield (found['file'], + pywikibot.Site(found['code'], found['fam'])) + + @property + def files(self): + """Return file generator depending on restore_all option. + + rtype: generator + """ + if self.opt.restore_all: + return self.get_files() + return iter([(self.FILE_PATTERN.format(site=self.site), self.site)]) + + def read_dump(self): + """Read the dump file. + + @rtype: generator + """ + for tail, site in self.files: + filename = os.path.join(self.path, tail) + + if not os.path.exists(filename): + pywikibot.output(tail + ' does not exist.') + else: + pywikibot.output('Retrieving pages from dump file ' + tail) + for page in pagegenerators.TextfilePageGenerator( + filename, site): + if site == self.site: + self._next_page = page.title(with_ns=False) + '!' + self._next_namespace = page.namespace() + yield page + else: + self.restored_files.add(filename) + + if self.opt.do_continue: + yield from self.site.allpages(start=self.next_page, + namespace=self.next_namespace, + filterredir=False) + + def write_dump(self, iterable, append: bool = True): + """Write dump file. + + @param iterable: an iterable of page titles to be dumped. + @type iterable: iterable + @param append: if a dump already exits, append the page titles to it + if True else overwrite it. + """ + filename = os.path.join(self.path, + self.FILE_PATTERN.format(site=self.site)) + mode = 'appended' if append else 'written' + with codecs.open(filename, mode[0], 'utf-8') as f: + f.write('\r\n'.join(iterable)) + f.write('\r\n') + pywikibot.output('Dump {site.code} ({site.family.name}) {mode}.' + .format(site=self.site, mode=mode)) + self.remove(filename) + + def delete_dumps(self): + """Delete processed dumps.""" + for filename in self.restored_files: + tail = os.path.split(filename)[-1] + try: + os.remove(filename) + pywikibot.output('Dumpfile {0} deleted'.format(tail)) + except OSError as e: + pywikibot.error('Cannot delete {} due to\n{}\nDo it manually.' + .format(tail, e)) + + def old_dumps_found(self) -> bool: + """Check whether dumps are in old format. + + @return: True if there are dumps in pickle format, False otherwise + """ + try: + next(self.get_files(mode='pickle')) + except StopIteration: + return False + pywikibot.warning(fill( + 'The pickle format is deprecated. Use maintenance script ' + 'interwikidumps.py to convert pickle files into text files.')) + return True + + def main(*args): """ Process command line arguments and invoke bot. @@ -2284,8 +2400,6 @@ hintlessPageGen = None optContinue = False optRestore = False - restoredFiles = [] - dumpFileName = '' append = True newPages = None @@ -2356,6 +2470,9 @@ mainpagename = site.siteinfo['mainpage'] iwconf.skip.add(pywikibot.Page(site, mainpagename)) + dump = InterwikiDumps(site=site, do_continue=optContinue, + restore_all=iwconf.restore_all) + if newPages is not None: if len(namespaces) == 0: ns = 0 @@ -2374,34 +2491,10 @@ namespaces=ns) elif optRestore or optContinue or iwconf.restore_all: - dumpFileName = pywikibot.config.datafilepath( - 'data', - 'interwiki-dumps', - '{0}-{1}.pickle'.format(site.family.name, site.code) - ) - try: - with open(dumpFileName, 'rb') as f: - dumpedTitles = pickle.load(f) - except (EOFError, IOError): - dumpedTitles = [] - pages = [pywikibot.Page(site, title) for title in dumpedTitles] - - hintlessPageGen = iter(pages) - if optContinue: - if pages: - last = pages[-1] - nextPage = last.title(with_ns=False) + '!' - namespace = last.namespace() - else: - pywikibot.output( - 'Dump file is empty?! Starting at the beginning.') - nextPage = '!' - namespace = 0 - gen2 = site.allpages(start=nextPage, - namespace=namespace, - filterredir=False) - hintlessPageGen = chain(hintlessPageGen, gen2) - restoredFiles.append(dumpFileName) + if dump.old_dumps_found(): + # There are dumps is pickle format; they must be converted first. + return + hintlessPageGen = dump.read_dump() bot = InterwikiBot(iwconf) @@ -2426,21 +2519,14 @@ try: bot.run() except KeyboardInterrupt: - dumpFileName = bot.dump(append) + dump.write_dump(bot.dump_titles, append) except Exception: pywikibot.exception() - dumpFileName = bot.dump(append) + dump.write_dump(bot.dump_titles, append) else: pywikibot.output('Script terminated sucessfully.') finally: - if dumpFileName: - with suppress(ValueError): - restoredFiles.remove(dumpFileName) - for dumpFileName in restoredFiles: - with suppress(OSError): - os.remove(dumpFileName) - pywikibot.output('Dumpfile {0} deleted' - .format(dumpFileName.split('\\')[-1])) + dump.delete_dumps() if __name__ == '__main__': diff --git a/scripts/maintenance/interwikidumps.py b/scripts/maintenance/interwikidumps.py new file mode 100644 index 0000000..7a1b5cf --- /dev/null +++ b/scripts/maintenance/interwikidumps.py @@ -0,0 +1,89 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +"""Script to convert interwiki dumps from pickle format to txt format.""" +# +# (C) Pywikibot team, 2019-2020 +# +# Distributed under the terms of the MIT license. +# +import codecs +import os +import pickle +import re + +import pywikibot + +from pywikibot import config2 as config + + +def pickle_files(path): + """Retrieve pickle files.""" + pattern = r'(?P<old>(?P<new>\A(?P<fam>[a-z]+)-(?P<code>[a-z]+)\.)pickle\Z)' + for filename in os.listdir(path): + found = re.match(pattern, filename) + if not found: + continue + + old = found['old'] + if os.path.exists(os.path.join(path, old)): + yield (old, found['new'] + 'txt', + pywikibot.Site(found['code'], found['fam'])) + + +def read_content(filename): + """Read content of pickle file.""" + try: + with open(filename, 'rb') as f: + titles = pickle.load(f) + except (EOFError, IOError): + pywikibot.exception() + titles = None + return titles + + +def write_content(filename, site, content): + """Write content to txt file.""" + titles = [pywikibot.Page(site, title).title(as_link=True) + for title in content] + with codecs.open(filename, 'w', 'utf-8') as f: + f.write('\r\n'.join(titles)) + f.write('\r\n') + + +def convert_dumps(): + """Convert interwikidump from pickle format to txt format.""" + folder = config.datafilepath('data', 'interwiki-dumps') + for old_file, new_file, site in pickle_files(folder): + # read old file + pywikibot.output('\nReading {}...'.format(old_file)) + old_filepath = os.path.join(folder, old_file) + titles = read_content(old_filepath) + + if not titles: + pywikibot.error('Unable to read ' + old_file) + continue + + # write new file + pywikibot.output('Writing {}...'.format(new_file)) + write_content(os.path.join(folder, new_file), site, titles) + + # delete old file + try: + os.remove(old_filepath) + pywikibot.output('Old dumpfile {} deleted'.format(old_file)) + except OSError as e: + pywikibot.error('Cannot delete {} due to\n{}\nDo it manually.' + .format(old_file, e)) + + +def main(*args): + """Main function.""" + args = pywikibot.argvu[1:] + if args and args[0] == '-help': + pywikibot.output(__doc__) + else: + convert_dumps() + + +if __name__ == '__main__': + main() diff --git a/tox.ini b/tox.ini index 6f62d87..bdac3fa 100644 --- a/tox.ini +++ b/tox.ini @@ -175,7 +175,7 @@ scripts/imagerecat.py : N803, N806, N802 scripts/imagetransfer.py : N803, N806, N816 scripts/imageuncat.py: N802, N816 - scripts/interwiki.py : N802, N803, N806, N816 + scripts/interwiki.py : N802, N803, N806, N815, N816 scripts/isbn.py : N802, N803, N806, N816 scripts/maintenance/* : T001 scripts/maintenance/download_dump.py : N815 -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/483939 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: Ie7380d587aab42ace158335de4f41fe9a5709700 Gerrit-Change-Number: 483939 Gerrit-PatchSet: 15 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: JAn Dudík <jan.dudik(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 6 months

[Gerrit] ...core[master]: [IMPR] reduce code complexity of imageharvest.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/638659 ) Change subject: [IMPR] reduce code complexity of imageharvest.py ...................................................................... [IMPR] reduce code complexity of imageharvest.py Change-Id: I3200e4655310e5cd2a9caaa70d1f3de2c7e7e554 --- M scripts/imageharvest.py 1 file changed, 41 insertions(+), 43 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/imageharvest.py b/scripts/imageharvest.py index a1cfdce..daa9a73 100644 --- a/scripts/imageharvest.py +++ b/scripts/imageharvest.py @@ -3,7 +3,7 @@ Bot for getting multiple images from an external site. It takes a URL as an argument and finds all images (and other files specified -by the extensions in 'fileformats') that URL is referring to, asking whether to +by the extensions in 'file_formats' that URL is referring to, asking whether to upload them. If further arguments are given, they are considered to be the text that is common to the descriptions. BeautifulSoup is needed only in this case. @@ -37,20 +37,18 @@ except ImportError as e: BeautifulSoup = e -fileformats = ('jpg', 'jpeg', 'png', 'gif', 'svg', 'ogg') +file_formats = ('.jpg', '.jpeg', '.png', '.gif', '.svg', '.ogg') -def get_imagelinks(url): +def get_imagelinks(url, shown): """Given a URL, get all images linked to by the page at that URL.""" - # Check if BeautifulSoup is imported. - if isinstance(BeautifulSoup, ImportError): - raise BeautifulSoup + links = [] response = fetch(url) if response.status_code != 200: pywikibot.output('Skipping url: {}' .format(url)) - return [] + return links soup = BeautifulSoup(response.text, 'html.parser') @@ -61,31 +59,35 @@ else: tagname = ['a', 'img'] - links = [] for tag in soup.findAll(tagname): link = tag.get('src', tag.get('href', None)) - if link: - ext = os.path.splitext(link)[1].lower().strip('.') - if ext in fileformats: - links.append(urljoin(url, link)) + if not link: + continue + _, ext = os.path.splitext(link) + if ext.lower() in file_formats: + links.append(urljoin(url, link)) return links -def run_bot(give_url, image_url, desc): +def get_categories(site): + """Get list of categories, if any.""" + categories = [] + while True: + cat = pywikibot.input('Specify a category (or press enter to ' + 'end adding categories)') + if not cat.strip(): + break + fmt = '[[{cat}]]' if ':' in cat else '[[{ns}:{cat}]]' + categories.append(fmt.format(ns=site.namespace(14), cat=cat)) + + return categories + + +def run_bot(give_url, image_url, desc, shown): """Run the bot.""" - url = give_url - if not url: - if image_url: - url = pywikibot.input('What URL range should I check ' - '(use $ for the part that is changeable)') - else: - url = pywikibot.input('From what URL should I get the images?') - - basicdesc = desc or pywikibot.input( - 'What text should be added at the end of ' - 'the description of each image from this url?') - - if image_url: + if not give_url and image_url: + url = pywikibot.input('What URL range should I check ' + '(use $ for the part that is changeable)') minimum = int(pywikibot.input( 'What is the first number to check (default: 1)') or 1) maximum = int(pywikibot.input( @@ -93,8 +95,15 @@ ilinks = (url.replace('$', str(i)) for i in range(minimum, maximum + 1)) else: - ilinks = get_imagelinks(url) + url = (give_url + or pywikibot.input('From what URL should I get the images?')) + ilinks = get_imagelinks(url, shown) + basicdesc = desc or pywikibot.input( + 'What text should be added at the end of ' + 'the description of each image from this url?') + + mysite = pywikibot.Site() for image in ilinks: try: include = pywikibot.input_yn('Include image {}?'.format(image), @@ -104,32 +113,21 @@ if not include: continue + categories = get_categories(mysite) desc = pywikibot.input('Give the description of this image:') - categories = [] - mysite = pywikibot.Site() - while True: - cat = pywikibot.input('Specify a category (or press enter to ' - 'end adding categories)') - if not cat.strip(): - break - if ':' in cat: - categories.append('[[{}]]'.format(cat)) - else: - categories.append('[[{}:{}]]' - .format(mysite.namespace(14), cat)) + desc += '\n\n' + basicdesc + '\n\n' + '\n'.join(categories) UploadRobot(image, description=desc).run() def main(*args): """Process command line arguments and invoke bot.""" - global shown url = '' image_url = False shown = False desc = [] - for arg in pywikibot.handle_args(): + for arg in pywikibot.handle_args(args): if arg == '-pattern': image_url = True elif arg == '-shown': @@ -143,9 +141,9 @@ desc = ' '.join(desc) if isinstance(BeautifulSoup, ImportError): - pywikibot.bot.suggest_help(missing_dependencies=('beautifulsoup4',)) + pywikibot.bot.suggest_help(missing_dependencies=['beautifulsoup4']) else: - run_bot(url, image_url, desc) + run_bot(url, image_url, desc, shown) if __name__ == '__main__': -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/638659 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: I3200e4655310e5cd2a9caaa70d1f3de2c7e7e554 Gerrit-Change-Number: 638659 Gerrit-PatchSet: 1 Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 6 months

[Gerrit] ...core[master]: [doc] add maintenance/sorting_order.py script to doc files

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/638567 ) Change subject: [doc] add maintenance/sorting_order.py script to doc files ...................................................................... [doc] add maintenance/sorting_order.py script to doc files Change-Id: I6ecc272fd716da893bdab655a31f55cf9af0309f --- M docs/scripts/scripts.maintenance.rst M scripts/README.rst 2 files changed, 7 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/scripts/scripts.maintenance.rst b/docs/scripts/scripts.maintenance.rst index f3dd955..b240a49 100644 --- a/docs/scripts/scripts.maintenance.rst +++ b/docs/scripts/scripts.maintenance.rst @@ -27,6 +27,11 @@ .. automodule:: scripts.maintenance.make_i18n_dict +scripts.maintenance.sorting\_order script +----------------------------------------- + +.. automodule:: scripts.maintenance.sorting_order + scripts.maintenance.update\_linktrails script --------------------------------------------- diff --git a/scripts/README.rst b/scripts/README.rst index 4062b9c..5130594 100644 --- a/scripts/README.rst +++ b/scripts/README.rst @@ -283,6 +283,8 @@ +------------------------+---------------------------------------------------------+ | make_i18n_dict.py | Generate a i18n file from a given script. | +------------------------+---------------------------------------------------------+ + | sorting_order.py | Updates interwiki sorting order in family.py file. | + +------------------------+---------------------------------------------------------+ | update_linktrails.py | Script that updates the linktrails in family.py file. | +------------------------+---------------------------------------------------------+ | wikimedia_sites.py | Updates the language lists in Wikimedia family files. | -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/638567 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: I6ecc272fd716da893bdab655a31f55cf9af0309f Gerrit-Change-Number: 638567 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 6 months

[Gerrit] ...core[master]: [bugfix] set defaults for Revision.user and Revision.userhidden

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/638478 ) Change subject: [bugfix] set defaults for Revision.user and Revision.userhidden ...................................................................... [bugfix] set defaults for Revision.user and Revision.userhidden Bug: T267120 Change-Id: Iad4198ab1d51cc4951ec3622d7ab02f3634dc557 --- M pywikibot/page/_revision.py 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page/_revision.py b/pywikibot/page/_revision.py index 8aa721f..a451cba 100644 --- a/pywikibot/page/_revision.py +++ b/pywikibot/page/_revision.py @@ -67,8 +67,11 @@ map_['timestamp'] = Timestamp.fromISOformat(map_['timestamp']) map_.update(anon='anon' in map_) - map_.setdefault('comment', '') map_.update(minor='minor' in map_) + map_.update(userhidden='userhidden' in map_) + + map_.setdefault('comment', '') + map_.setdefault('user', '') if 'slots' in map_: # mw 1.32+ mainslot = map_['slots'].get('main', {}) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/638478 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: Iad4198ab1d51cc4951ec3622d7ab02f3634dc557 Gerrit-Change-Number: 638478 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 6 months

[Gerrit] ...core[master]: Modify data_ingestion_tests.py to support python 3.5+ only

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/638501 ) Change subject: Modify data_ingestion_tests.py to support python 3.5+ only ...................................................................... Modify data_ingestion_tests.py to support python 3.5+ only Bug: T257399 Change-Id: I975db77bdb839d2e147035ed2f09ec5588a754e0 --- M tests/data_ingestion_tests.py 1 file changed, 2 insertions(+), 4 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/data_ingestion_tests.py b/tests/data_ingestion_tests.py index 885110c..41fcdce 100644 --- a/tests/data_ingestion_tests.py +++ b/tests/data_ingestion_tests.py @@ -6,8 +6,6 @@ # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - from scripts import data_ingestion from tests import join_data_path, join_images_path @@ -31,7 +29,7 @@ def setUp(self): """Set up unit test.""" - super(TestPhoto, self).setUp() + super().setUp() url = ('http://upload.wikimedia.org/wikipedia/commons/f/' 'fc/MP_sounds.png') @@ -84,7 +82,7 @@ def setUp(self): """Set up unit test.""" - super(TestCSVReader, self).setUp() + super().setUp() with open(join_data_path('csv_ingestion.csv')) as fileobj: self.iterator = data_ingestion.CSVReader(fileobj, 'url', site=self.get_site()) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/638501 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: I975db77bdb839d2e147035ed2f09ec5588a754e0 Gerrit-Change-Number: 638501 Gerrit-PatchSet: 1 Gerrit-Owner: Diwanshu885 <dmittal885(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 6 months

[Gerrit] ...core[master]: [tests] Remove some deprecated code from code coverage

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/638332 ) Change subject: [tests] Remove some deprecated code from code coverage ...................................................................... [tests] Remove some deprecated code from code coverage Change-Id: I385dbf2a0dfa093c2ef6dff06874e7d1059b75d4 --- M pywikibot/bot.py M pywikibot/comms/http.py M pywikibot/comms/threadedhttp.py M pywikibot/data/api.py M pywikibot/data/wikistats.py M pywikibot/families/wikimediachapter_family.py M pywikibot/page/__init__.py M pywikibot/site/__init__.py M pywikibot/version.py 9 files changed, 60 insertions(+), 56 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 6a954c7..dc5599d 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -861,7 +861,7 @@ @deprecated('handle_args', since='20150409', future_warning=True) -def handleArgs(*args): +def handleArgs(*args): # pragma: no cover """DEPRECATED. Use handle_args().""" return handle_args(args) @@ -896,7 +896,7 @@ @deprecated('show_help', since='20200705') -def showHelp(module_name=None): +def showHelp(module_name=None): # pragma: no cover """DEPRECATED. Use show_help().""" return show_help(module_name) @@ -1092,7 +1092,7 @@ return cls.available_options @deprecated('set_options', since='20201006') - def setOptions(self, **kwargs): + def setOptions(self, **kwargs): # pragma: no cover """DEPRECATED. Set the instance options.""" self.set_options(**kwargs) @@ -1122,7 +1122,7 @@ .format(opt)) @deprecated(_DEPRECATION_MSG, since='20201006') - def getOption(self, option): + def getOption(self, option): # pragma: no cover """DEPRECATED. Get the current value of an option. @param option: key defined in OptionHandler.available_options @@ -1133,13 +1133,13 @@ @property @deprecated(_DEPRECATION_MSG, since='20201006', future_warning=True) - def options(self): + def options(self): # pragma: no cover """DEPRECATED. Return changed options.""" return self.opt._options @options.setter @deprecated(_DEPRECATION_MSG, since='20201006', future_warning=True) - def options(self, options): + def options(self, options): # pragma: no cover """DEPRECATED. Return changed options.""" self.set_options(**options) @@ -1347,7 +1347,7 @@ return False @deprecated('generator.close()', since='20200804') - def stop(self): + def stop(self): # pragma: no cover """Stop iterating.""" pywikibot.output('Generator has been stopped.') self.generator.close() diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index ef9cb6e..deea88f 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -294,7 +294,7 @@ @deprecated(since='20201015', future_warning=True) -def _http_process(session, http_request) -> None: +def _http_process(session, http_request) -> None: # pragma: no cover """DEPRECATED. Process an `threadedhttp.HttpRequest` instance. @@ -366,7 +366,7 @@ @deprecated(since='20201015', future_warning=True) def _enqueue(uri, method='GET', params=None, body=None, headers=None, - data=None, **kwargs): + data=None, **kwargs): # pragma: no cover """DEPRECATED. Enqueue non-blocking threaded HTTP request with callback. diff --git a/pywikibot/comms/threadedhttp.py b/pywikibot/comms/threadedhttp.py index 39d739c..659acab 100644 --- a/pywikibot/comms/threadedhttp.py +++ b/pywikibot/comms/threadedhttp.py @@ -59,27 +59,27 @@ @property @deprecated('the `url` attribute', since='20201011', future_warning=True) - def uri(self): + def uri(self): # pragma: no cover """DEPRECATED. Return the response URL.""" return self.url @uri.setter @deprecated('the `url` attribute', since='20201011', future_warning=True) - def uri(self, value): + def uri(self, value): # pragma: no cover """DEPRECATED. Set the response URL.""" self.url = value @property @deprecated('the `all_headers` property', since='20201011', future_warning=True) - def headers(self): + def headers(self): # pragma: no cover """DEPRECATED. Return the response headers.""" return self.all_headers @headers.setter @deprecated('the `all_headers` property', since='20201011', future_warning=True) - def headers(self, value): + def headers(self, value): # pragma: no cover """DEPRECATED. Set the response headers.""" self.all_headers = value @@ -128,7 +128,7 @@ @property @deprecated('urlparse(HttpRequest.url)', since='20201011', future_warning=True) - def parsed_uri(self): + def parsed_uri(self): # pragma: no cover """DEPRECATED. Return the parsed requested uri.""" if not self._parsed_uri: self._parsed_uri = urlparse(self.uri) @@ -137,14 +137,14 @@ @property @deprecated('urlparse(HttpRequest.url).netloc', since='20201011', future_warning=True) - def hostname(self): + def hostname(self): # pragma: no cover """DEPRECATED. Return the host of the request.""" return self.parsed_uri.netloc @property @deprecated('the `status_code` property', since='20201011', future_warning=True) - def status(self) -> Optional[int]: + def status(self) -> Optional[int]: # pragma: no cover """DEPRECATED. Return the HTTP response status.""" return self.status_code @@ -225,14 +225,14 @@ return result @deprecated('the `text` property', since='20201011', future_warning=True) - def decode(self, encoding, errors='strict') -> str: + def decode(self, encoding, errors='strict') -> str: # pragma: no cover """Return the decoded response.""" return self.raw.decode(encoding, errors) if not self.exception else None @property @deprecated('the `text` property', since='20180321', future_warning=True) - def content(self) -> str: + def content(self) -> str: # pragma: no cover """DEPRECATED. Return the response decoded by the detected encoding. @note: The behaviour will be changed. @@ -246,11 +246,11 @@ return self.raw.decode(self.encoding) @deprecated('the `text` property', since='20201011', future_warning=True) - def __str__(self) -> str: + def __str__(self) -> str: # pragma: no cover """Return the response decoded by the detected encoding.""" return self.text @deprecated(since='20201011', future_warning=True) - def __bytes__(self) -> Optional[bytes]: + def __bytes__(self) -> Optional[bytes]: # pragma: no cover """Return the undecoded response.""" return self.raw diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py index a092e46..cb6abe1 100644 --- a/pywikibot/data/api.py +++ b/pywikibot/data/api.py @@ -1335,7 +1335,7 @@ return list(self._params.items()) @deprecated(since='20141006', future_warning=True) - def http_params(self): + def http_params(self): # pragma: no cover """Return the parameters formatted for inclusion in an HTTP request. DEPRECATED. See _encoded_items for explanation of encoding used. diff --git a/pywikibot/data/wikistats.py b/pywikibot/data/wikistats.py index 53757ab..edf811c 100644 --- a/pywikibot/data/wikistats.py +++ b/pywikibot/data/wikistats.py @@ -80,7 +80,7 @@ self._data = {} @deprecated('get', since='20201017', future_warning=True) - def fetch(self, table: str, format='xml') -> bytes: + def fetch(self, table: str, format='xml') -> bytes: # pragma: no cover """ DEPRECATED. Fetch data from WikiStats. @@ -104,7 +104,8 @@ return r.raw @deprecated('get', since='20201017', future_warning=True) - def raw_cached(self, table: str, format='csv') -> bytes: + def raw_cached(self, table: str, + format='csv') -> bytes: # pragma: no cover """ DEPRECATED. Cache raw data. @@ -120,7 +121,7 @@ return data @deprecated('get', since='20201017', future_warning=True) - def csv(self, table: str) -> list: + def csv(self, table: str) -> list: # pragma: no cover """ DEPRECATED. Get a list of a table of data. diff --git a/pywikibot/families/wikimediachapter_family.py b/pywikibot/families/wikimediachapter_family.py index 063f771..bb08c2c 100644 --- a/pywikibot/families/wikimediachapter_family.py +++ b/pywikibot/families/wikimediachapter_family.py @@ -29,6 +29,6 @@ @classproperty @deprecated(since='20150621', future_warning=True) - def countries(cls): + def countries(cls): # pragma: no cover """Deprecated.""" return cls.codes diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index 386ee55..35b04b6 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -587,12 +587,12 @@ self._revid = value @deprecated('latest_revision_id', since='20150727', future_warning=True) - def latestRevision(self): + def latestRevision(self): # pragma: no cover """Return the current revision id for this page.""" return self.latest_revision_id @deprecated('latest_revision_id', since='20150407', future_warning=True) - def pageAPInfo(self): + def pageAPInfo(self): # pragma: no cover """Return the current revision id for this page.""" if self.isRedirectPage(): raise pywikibot.IsRedirectPage(self) @@ -740,7 +740,7 @@ @property @deprecated('latest_revision.parent_id (0 instead of -1 when no parent)', since='20150609', future_warning=True) - def previous_revision_id(self) -> int: + def previous_revision_id(self) -> int: # pragma: no cover """ Return the revision id for the previous revision of this Page. @@ -750,7 +750,7 @@ @deprecated('latest_revision.parent_id (0 instead of -1 when no parent)', since='20150609', future_warning=True) - def previousRevision(self) -> int: + def previousRevision(self) -> int: # pragma: no cover """ Return the revision id for the previous revision. @@ -835,7 +835,7 @@ raise pywikibot.IsNotRedirectPage(self) @deprecated(since='20151207', future_warning=True) - def isEmpty(self) -> bool: + def isEmpty(self) -> bool: # pragma: no cover """ Return True if the page text has less than 4 characters. @@ -1080,7 +1080,7 @@ return self.site.page_can_be_edited(self, action) @deprecated("Page.has_permission('edit')", since='20200208') - def canBeEdited(self): + def canBeEdited(self): # pragma: no cover """DEPRECATED. Determine whether the page may be edited.""" return self.has_permission() @@ -1332,11 +1332,13 @@ force=force, asynchronous=asynchronous, callback=callback, **kwargs) - @deprecated('put(asynchronous=True) or save(asynchronous=True)') + @deprecated('put(asynchronous=True) or save(asynchronous=True)', + since='20180501') @deprecated_args(comment='summary', watchArticle='watch', minorEdit='minor') def put_async(self, newtext, summary=None, watch=None, minor=True, - botflag=None, force=False, callback=None, **kwargs): + botflag=None, force=False, callback=None, + **kwargs): # pragma: no cover """ Put page on queue to be saved to wiki asynchronously. @@ -1646,7 +1648,7 @@ return self.site.getredirtarget(self) @deprecated('moved_target()', since='20150524', future_warning=True) - def getMovedTarget(self): + def getMovedTarget(self): # pragma: no cover """ Return a Page object for the target this Page was moved to. @@ -1727,7 +1729,8 @@ starttime=starttime, endtime=endtime)) @deprecated('contributors().keys()', since='20150206', future_warning=True) - def contributingUsers(self, total: Optional[int] = None): + def contributingUsers(self, + total: Optional[int] = None): # pragma: no cover """ Return a set of usernames (or IPs) of users who edited this page. @@ -1761,7 +1764,7 @@ @deprecated('contributors() or revisions()', since='20150206', future_warning=True) - @deprecated_args(limit='total') + @deprecated_args(limit='total') # pragma: no cover def getLatestEditors(self, total=1) -> list: """ Get a list of revision information of the last total edits. @@ -2156,7 +2159,7 @@ return False @deprecated('Page.is_flow_page()', since='20150128', future_warning=True) - def isFlowPage(self): + def isFlowPage(self): # pragma: no cover """DEPRECATED: use self.is_flow_page instead.""" return self.is_flow_page() @@ -2197,7 +2200,7 @@ # ####### DEPRECATED METHODS ######## @deprecated('Page.protection()', since='20150725', future_warning=True) - def getRestrictions(self): + def getRestrictions(self): # pragma: no cover """DEPRECATED. Use self.protection() instead.""" restrictions = self.protection() return {k: list(restrictions[k]) for k in restrictions} @@ -2479,7 +2482,7 @@ return self._imagePageHtml @deprecated('get_file_url', since='20160609') - def fileUrl(self): + def fileUrl(self): # pragma: no cover """Return the URL for the file described on this page.""" return self.latest_file_info.url @@ -2515,7 +2518,7 @@ return self.latest_file_info.thumburl @deprecated('file_is_shared', since='20200618') - def fileIsShared(self) -> bool: + def fileIsShared(self) -> bool: # pragma: no cover """DEPRECATED. Check if the image is stored on Wikimedia Commons.""" return self.file_is_shared() @@ -3011,7 +3014,7 @@ 'This is an autoblock ID, you can only use to unblock it.') @deprecated('User.username', since='20160504') - def name(self) -> str: + def name(self) -> str: # pragma: no cover """ The username. @@ -4817,7 +4820,7 @@ return self._type @deprecated('Property.type', since='20140607', future_warning=True) - def getType(self): + def getType(self): # pragma: no cover """ Return the type of this property. diff --git a/pywikibot/site/__init__.py b/pywikibot/site/__init__.py index 5a23f86..dbee6f6 100644 --- a/pywikibot/site/__init__.py +++ b/pywikibot/site/__init__.py @@ -392,7 +392,7 @@ @classmethod @deprecated('NamespacesDict.lookup_name', since='20150703', future_warning=True) - def lookup_name(cls, name: str, namespaces=None): + def lookup_name(cls, name: str, namespaces=None): # pragma: no cover """ Find the Namespace for a name. @@ -410,7 +410,7 @@ @staticmethod @deprecated('NamespacesDict.resolve', since='20150703', future_warning=True) - def resolve(identifiers, namespaces=None): + def resolve(identifiers, namespaces=None): # pragma: no cover """ Resolve namespace identifiers to obtain Namespace objects. @@ -948,7 +948,7 @@ @deprecated('APISite.namespaces.lookup_name', since='20150703', future_warning=True) - def ns_index(self, namespace): + def ns_index(self, namespace): # pragma: no cover """ Return the Namespace for a given namespace name. @@ -961,7 +961,7 @@ @deprecated('APISite.namespaces.lookup_name', since='20150703', future_warning=True) - def getNamespaceIndex(self, namespace): + def getNamespaceIndex(self, namespace): # pragma: no cover """DEPRECATED: Return the Namespace for a given namespace name.""" return self.namespaces.lookup_name(namespace) @@ -1159,7 +1159,7 @@ @deprecated('list(namespaces.CATEGORY)', since='20150829', future_warning=True) - def category_namespaces(self): + def category_namespaces(self): # pragma: no cover """Return names for the Category namespace.""" return list(self.namespace(14, all=True)) @@ -1182,7 +1182,7 @@ @deprecated('pywikibot.data.api.encode_url', since='20151211', future_warning=True) - def urlEncode(self, query): + def urlEncode(self, query): # pragma: no cover """DEPRECATED.""" return api.encode_url(query) @@ -1986,7 +1986,7 @@ return [word] @deprecated('expand_text', since='20150831', future_warning=True) - def resolvemagicwords(self, wikitext): + def resolvemagicwords(self, wikitext): # pragma: no cover """ Replace the {{ns:xx}} marks in a wikitext with the namespace names. @@ -2082,7 +2082,7 @@ @deprecated('siteinfo or Namespace instance', since='20150830', future_warning=True) - def case(self): + def case(self): # pragma: no cover """Return this site's capitalization rule.""" # This is the global setting via $wgCapitalLinks, it is used whenever # the namespaces don't propagate the namespace specific value. @@ -2093,7 +2093,7 @@ return self.siteinfo['wikiid'] @deprecated('APISite.lang', since='20150629', future_warning=True) - def language(self): + def language(self): # pragma: no cover """Return the code for the language of this Site.""" return self.lang @@ -2474,7 +2474,7 @@ @deprecated('Check the content model instead', since='20150128', future_warning=True) - def loadflowinfo(self, page): + def loadflowinfo(self, page): # pragma: no cover """ Load Flow-related information about a given page. @@ -2943,7 +2943,7 @@ @deprecated("the 'tokens' property", since='20150218', future_warning=True) @remove_last_args(['sysop']) - def getToken(self, getalways=True, getagain=False): + def getToken(self, getalways=True, getagain=False): # pragma: no cover """DEPRECATED: Get edit token.""" if self.username() != self.user(): raise ValueError('The token for {0} was requested but only the ' @@ -2960,7 +2960,7 @@ @deprecated("the 'tokens' property", since='20150218', future_warning=True) @remove_last_args(['sysop']) - def getPatrolToken(self): + def getPatrolToken(self): # pragma: no cover """DEPRECATED: Get patrol token.""" if self.username() != self.user(): raise ValueError('The token for {0} was requested but only the ' @@ -7002,7 +7002,7 @@ return wbdata[props] @deprecated('pywikibot.ItemPage', since='20130307', future_warning=True) - def get_item(self, source, **params): + def get_item(self, source, **params): # pragma: no cover """Get the data for multiple Wikibase items.""" return self._get_item(source, **params) diff --git a/pywikibot/version.py b/pywikibot/version.py index 7a0884d..ce66b6f 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -386,7 +386,7 @@ @deprecated('get_module_version, get_module_filename and get_module_mtime', since='20150221', future_warning=True) -def getfileversion(filename: str): +def getfileversion(filename: str): # pragma: no cover """Retrieve revision number of file. Extracts __version__ variable containing Id tag, without importing it. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/638332 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: I385dbf2a0dfa093c2ef6dff06874e7d1059b75d4 Gerrit-Change-Number: 638332 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 6 months

[Gerrit] ...core[master]: [doc] Positional arguments of page.Revision must be replaced

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/638296 ) Change subject: [doc] Positional arguments of page.Revision must be replaced ...................................................................... [doc] Positional arguments of page.Revision must be replaced Change-Id: I6941a6e5d731caa73edfe4017cbc905dfdeaa43f --- M ROADMAP.rst M pywikibot/page/_revision.py 2 files changed, 2 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/ROADMAP.rst b/ROADMAP.rst index b35bddd..e6c246c 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -8,6 +8,7 @@ Future release notes ~~~~~~~~~~~~~~~~~~~~ +* 5.1.0: Positional arguments of page.Revision must be replaced by keyword arguments (T259428) * 5.0.0: wikistats methods fetch, raw_cached, csv, xml will be removed * 5.0.0: PageRelatedError.getPage() will be removes in favour of PageRelatedError.page * 5.0.0: HttpRequest result of http.fetch() will be replaced by requests.Response (T265206) diff --git a/pywikibot/page/_revision.py b/pywikibot/page/_revision.py index 9331b46..8aa721f 100644 --- a/pywikibot/page/_revision.py +++ b/pywikibot/page/_revision.py @@ -48,7 +48,7 @@ ) # replace positional arguments with keyword arguments - for i, (arg, key) in enumerate(zip(args, keys)): + for i, (arg, key) in enumerate(zip(args, keys)): # pragma: no cover issue_deprecation_warning('Positional argument {} ({})' .format(i + 1, arg), 'keyword argument "{}={}"' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/638296 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: I6941a6e5d731caa73edfe4017cbc905dfdeaa43f Gerrit-Change-Number: 638296 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 6 months

[Gerrit] ...core[master]: [doc] Updat ROADMAP.rst

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/638279 ) Change subject: [doc] Updat ROADMAP.rst ...................................................................... [doc] Updat ROADMAP.rst Change-Id: I0fea149326892f4cf4b815047caabe29f394694d --- M ROADMAP.rst 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/ROADMAP.rst b/ROADMAP.rst index 43dbba4..b35bddd 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,7 +1,7 @@ Current release changes ~~~~~~~~~~~~~~~~~~~~~~~ -* Rewrite Revision class (T102735, T259428) +* Rewrite Revision class; each data can be accessed either by key or as an attribute (T102735, T259428) * L10N-Updates -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/638279 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: I0fea149326892f4cf4b815047caabe29f394694d Gerrit-Change-Number: 638279 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 6 months

← Newer
1
...
7
8
9
10
11
12
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits November 2020