Pywikibot-commits February 2021

pywikibot-commits@lists.wikimedia.org

1 participants
134 discussions

[Gerrit] ...core[master]: [6.0] Archive unused scripts and remove already archived scripts

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/660644 ) Change subject: [6.0] Archive unused scripts and remove already archived scripts ...................................................................... [6.0] Archive unused scripts and remove already archived scripts Any archived script may be unarchived upon request on the task. Tests updated/archived accordingly. Bug: T223826 Change-Id: Ic694a413623b7e2ffed9cc7e8d64d191df3c1248 --- M docs/scripts/scripts.rst M scripts/README.rst R scripts/archive/blockpageschecker.py R scripts/archive/capitalize_redirects.py R scripts/archive/casechecker.py R scripts/archive/catall.py D scripts/archive/cfd.py R scripts/archive/commons_link.py R scripts/archive/commonscat.py R scripts/archive/create_categories.py R scripts/archive/data_ingestion.py R scripts/archive/disambredir.py R scripts/archive/djvutext.py R scripts/archive/editarticle.py D scripts/archive/featured.py R scripts/archive/flickrripper.py R scripts/archive/followlive.py R scripts/archive/freebasemappingupload.py R scripts/archive/image.py R scripts/archive/imagecopy.py R scripts/archive/imagecopy_self.py R scripts/archive/imageharvest.py R scripts/archive/imagerecat.py R scripts/archive/imageuncat.py R scripts/archive/interwiki.py R scripts/archive/isbn.py R scripts/archive/lonelypages.py R scripts/archive/makecat.py R scripts/archive/match_images.py R scripts/archive/ndashredir.py R scripts/archive/nowcommons.py R scripts/archive/patrol.py R scripts/archive/piper.py R scripts/archive/reflinks.py R scripts/archive/replicate_wiki.py R scripts/archive/selflink.py R scripts/archive/spamremove.py R scripts/archive/standardize_interwiki.py R scripts/archive/states_redirect.py R scripts/archive/surnames_redirects.py R scripts/archive/table2wiki.py R scripts/archive/unlink.py R scripts/archive/unusedfiles.py R scripts/archive/watchlist.py R scripts/archive/wikisourcetext.py M scripts/interwikidata.py M tests/__init__.py R tests/archive/data_ingestion_tests.py R tests/archive/disambredir_tests.py R tests/archive/imagecopy_tests.py R tests/archive/isbn_tests.py R tests/archive/patrolbot_tests.py R tests/archive/reflinks_tests.py M tests/pwb_tests.py M tests/script_tests.py M tox.ini 56 files changed, 111 insertions(+), 1,223 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/scripts/scripts.rst b/docs/scripts/scripts.rst index af4bab2..0877531 100644 --- a/docs/scripts/scripts.rst +++ b/docs/scripts/scripts.rst @@ -31,26 +31,6 @@ .. automodule:: scripts.basic -scripts.blockpageschecker script --------------------------------- - -.. automodule:: scripts.blockpageschecker - -scripts.capitalize\_redirects script ------------------------------------- - -.. automodule:: scripts.capitalize_redirects - -scripts.casechecker script --------------------------- - -.. automodule:: scripts.casechecker - -scripts.catall script ---------------------- - -.. automodule:: scripts.catall - scripts.category script ----------------------- @@ -81,16 +61,6 @@ .. automodule:: scripts.clean_sandbox -scripts.commons\_link script ----------------------------- - -.. automodule:: scripts.commons_link - -scripts.commonscat script -------------------------- - -.. automodule:: scripts.commonscat - scripts.coordinate\_import script --------------------------------- @@ -101,61 +71,21 @@ .. automodule:: scripts.cosmetic_changes -scripts.create\_categories script ---------------------------------- - -.. automodule:: scripts.create_categories - -scripts.data\_ingestion script ------------------------------- - -.. automodule:: scripts.data_ingestion - scripts.delete script --------------------- .. automodule:: scripts.delete -scripts.disambredir script --------------------------- - -.. automodule:: scripts.disambredir - -scripts.djvutext script ------------------------ - -.. automodule:: scripts.djvutext - scripts.download\_dump script ----------------------------- .. automodule:: scripts.download_dump -scripts.editarticle script --------------------------- - -.. automodule:: scripts.editarticle - scripts.fixing\_redirects script -------------------------------- .. automodule:: scripts.fixing_redirects -scripts.flickrripper script ---------------------------- - -.. automodule:: scripts.flickrripper - -scripts.followlive script -------------------------- - -.. automodule:: scripts.followlive - -scripts.freebasemappingupload script ------------------------------------- - -.. automodule:: scripts.freebasemappingupload - scripts.harvest\_template script -------------------------------- @@ -166,81 +96,21 @@ .. automodule:: scripts.illustrate_wikidata -scripts.image script --------------------- - -.. automodule:: scripts.image - -scripts.imagecopy script ------------------------- - -.. automodule:: scripts.imagecopy - -scripts.imagecopy\_self script ------------------------------- - -.. automodule:: scripts.imagecopy_self - -scripts.imageharvest script ---------------------------- - -.. automodule:: scripts.imageharvest - -scripts.imagerecat script -------------------------- - -.. automodule:: scripts.imagerecat - scripts.imagetransfer script ---------------------------- .. automodule:: scripts.imagetransfer -scripts.imageuncat script -------------------------- - -.. automodule:: scripts.imageuncat - -scripts.interwiki script ------------------------- - -.. automodule:: scripts.interwiki - scripts.interwikidata script ---------------------------- .. automodule:: scripts.interwikidata -scripts.isbn script -------------------- - -.. automodule:: scripts.isbn - scripts.listpages script ------------------------ .. automodule:: scripts.listpages -scripts.login script --------------------- - -.. automodule:: scripts.login - -scripts.lonelypages script --------------------------- - -.. automodule:: scripts.lonelypages - -scripts.makecat script ----------------------- - -.. automodule:: scripts.makecat - -scripts.match\_images script ----------------------------- - -.. automodule:: scripts.match_images - scripts.misspelling script -------------------------- @@ -251,11 +121,6 @@ .. automodule:: scripts.movepages -scripts.ndashredir script -------------------------- - -.. automodule:: scripts.ndashredir - scripts.newitem script ---------------------- @@ -266,11 +131,6 @@ .. automodule:: scripts.noreferences -scripts.nowcommons script -------------------------- - -.. automodule:: scripts.nowcommons - scripts.pagefromfile script --------------------------- @@ -281,16 +141,6 @@ .. automodule:: scripts.parser_function_count -scripts.patrol script ---------------------- - -.. automodule:: scripts.patrol - -scripts.piper script --------------------- - -.. automodule:: scripts.piper - scripts.protect script ---------------------- @@ -300,31 +150,16 @@ ----------------------- .. automodule:: scripts.redirect -scripts.reflinks script ------------------------ - -.. automodule:: scripts.reflinks - scripts.replace script ---------------------- .. automodule:: scripts.replace -scripts.replicate\_wiki script ------------------------------- - -.. automodule:: scripts.replicate_wiki - scripts.revertbot script ------------------------ .. automodule:: scripts.revertbot -scripts.selflink script ------------------------ - -.. automodule:: scripts.selflink - scripts.shell script -------------------- @@ -335,36 +170,11 @@ .. automodule:: scripts.solve_disambiguation -scripts.spamremove script -------------------------- - -.. automodule:: scripts.spamremove - scripts.speedy\_delete script ----------------------------- .. automodule:: scripts.speedy_delete -scripts.standardize\_interwiki script -------------------------------------- - -.. automodule:: scripts.standardize_interwiki - -scripts.states\_redirect script -------------------------------- - -.. automodule:: scripts.states_redirect - -scripts.surnames\_redirects script ----------------------------------- - -.. automodule:: scripts.surnames_redirects - -scripts.table2wiki script -------------------------- - -.. automodule:: scripts.table2wiki - scripts.template script ----------------------- @@ -385,16 +195,6 @@ .. automodule:: scripts.transferbot -scripts.unlink script ---------------------- - -.. automodule:: scripts.unlink - -scripts.unusedfiles script --------------------------- - -.. automodule:: scripts.unusedfiles - scripts.upload script --------------------- @@ -405,11 +205,6 @@ .. automodule:: scripts.version -scripts.watchlist script ------------------------- - -.. automodule:: scripts.watchlist - scripts.weblinkchecker script ----------------------------- @@ -420,9 +215,4 @@ .. automodule:: scripts.welcome -scripts.wikisourcetext script ------------------------------ - -.. automodule:: scripts.wikisourcetext - diff --git a/scripts/README.rst b/scripts/README.rst index 8a2ec98..e9e6d69 100644 --- a/scripts/README.rst +++ b/scripts/README.rst @@ -27,17 +27,6 @@ +------------------------+---------------------------------------------------------+ | basic.py | Is a template from which simple bots can be made. | +------------------------+---------------------------------------------------------+ - | blockpagechecker.py | Deletes any protection templates that are on pages | - | | which aren't actually protected. | - +------------------------+---------------------------------------------------------+ - | capitalize_redirects.py| Script to create a redirect of capitalize articles. | - +------------------------+---------------------------------------------------------+ - | casechecker.py | Script to enumerate all pages in the wikipedia and | - | | find all titles with mixed Latin and Cyrillic | - | | alphabets. | - +------------------------+---------------------------------------------------------+ - | catall.py | Add or change categories on a number of pages. | - +------------------------+---------------------------------------------------------+ | category.py | Add a category link to all pages mentioned on a page, | | | change or remove category tags | +------------------------+---------------------------------------------------------+ @@ -56,13 +45,6 @@ +------------------------+---------------------------------------------------------+ | clean_sandbox.py | This bot makes the cleaned of the page of tests. | +------------------------+---------------------------------------------------------+ - | commons_link.py | This robot include commons template to linking Commons | - | | and your wiki project. | - +------------------------+---------------------------------------------------------+ - | commonscat.py | Adds {{commonscat}} to Wikipedia categories (or | - | | articles), if other language wikipedia already has such | - | | a template | - +------------------------+---------------------------------------------------------+ | coordinate_import.py | Coordinate importing script. | +------------------------+---------------------------------------------------------+ | #copyright.py | This robot check copyright text in Google, Yahoo! and | @@ -76,93 +58,41 @@ | cosmetic_changes.py | Can do slight modifications to a wiki page source code | | | such that the code looks cleaner. | +------------------------+---------------------------------------------------------+ - | create_categories.py | Program to batch create categories. | - +------------------------+---------------------------------------------------------+ - | data_ingestion.py | A generic bot to do batch uploading to Commons. | - +------------------------+---------------------------------------------------------+ | delete.py | This script can be used to delete pages en masse. | +------------------------+---------------------------------------------------------+ - | disambredir.py | Changing redirect names in disambiguation pages. | - +------------------------+---------------------------------------------------------+ - | djvutext.py | Extracts OCR text from djvu files and uploads onto | - | | pages in the "Page" namespace on Wikisource. | - +------------------------+---------------------------------------------------------+ | download_dump.py | Downloads dumps from dumps.wikimedia.org | +------------------------+---------------------------------------------------------+ - | editarticle.py | Edit a Wikipedia article with your favourite editor | - +------------------------+---------------------------------------------------------+ | fixing_redirects.py | Correct all redirect links of processed pages. | +------------------------+---------------------------------------------------------+ - | flickrripper.py | Upload images from Flickr easily. | - +------------------------+---------------------------------------------------------+ - | followlive.py | follow new articles on a wikipedia and flag them | - | | with a template. | - +------------------------++--------------------------------------------------------+ - | freebasemappingupload.py| Docstring fixes in scripts | - +------------------------++--------------------------------------------------------+ | harvest_template.py | [IMPROV] Reduce maximum line length to 130 | +------------------------+---------------------------------------------------------+ | illustrate_wikidata.py | Don't use 'gen' to refer to the generator factory | +------------------------+---------------------------------------------------------+ - | image.py | This script can be used to change one image to another | - | | or remove an image entirely. | - +------------------------+---------------------------------------------------------+ - | imagecopy.py | Copies images from a Wikimedia wiki to Commons | - +------------------------+---------------------------------------------------------+ - | imagecopy_self.py | Copy self published files from the English Wikipedia to | - | | Commons. | - +------------------------+---------------------------------------------------------+ - | imageharvest.py | Bot for getting multiple images from an external site. | - +------------------------+---------------------------------------------------------+ - | iamgerecat.py | Try to find categories for media on Commons. | - +------------------------+---------------------------------------------------------+ | imagetransfer.py | Given a wiki page, check the interwiki links for | | | images, and let the user choose among them for | | | images to upload. | +------------------------+---------------------------------------------------------+ - | imageuncat.py | Adds uncat template to images without categories at | - | | Commons | - +------------------------+---------------------------------------------------------+ | #inline_images.py | This bot looks for images that are linked inline | | | (i.e., they are hosted from an external server and | | | hotlinked). | +------------------------+---------------------------------------------------------+ - | interwiki.py | A robot to check interwiki links on all pages (or | - | | a range of pages) of a wiki. | - +------------------------+---------------------------------------------------------+ | interwikidata.py | Script to handle interwiki links based on Wikibase. | +------------------------+---------------------------------------------------------+ - | isbn.py | Bot to convert all ISBN-10 codes to the ISBN-13 | - | | format. | - +------------------------+---------------------------------------------------------+ | listpages.py | listpages: report number of pages found | +------------------------+---------------------------------------------------------+ | login.py | Script to log the bot in to a wiki account. | +------------------------+---------------------------------------------------------+ - | lonelypages.py | Place a template on pages which are not linked to by | - | | other pages, and are therefore lonely | - +------------------------+---------------------------------------------------------+ - | makecat.py | Given an existing or new category, find pages for that | - | | category. | - +------------------------+---------------------------------------------------------+ - | match_images.py | Match two images based on histograms. | - +------------------------+---------------------------------------------------------+ | misspelling.py | Similar to solve_disambiguation.py. It is supposed to | | | fix links that contain common spelling mistakes. | +------------------------+---------------------------------------------------------+ | movepages.py | Bot page moves to another title. | +------------------------+---------------------------------------------------------+ - | ndashredir.py | Creates hyphenated redirects to articles with n dash | - | | or m dash in their title. | - +------------------------+---------------------------------------------------------+ | newitem.py | Script creates new items on Wikidata based on criteria. | +------------------------+---------------------------------------------------------+ | noreferences.py | Searches for pages where <references /> is missing | | | although a <ref> tag is present, and in that case adds | | | a new references section. | +------------------------+---------------------------------------------------------+ - | nowcommons.py | This bot can delete images with NowCommons template. | - +------------------------+---------------------------------------------------------+ | pagefromfile.py | This bot takes its input from a file that contains a | | | number of pages to be put on the wiki. | +------------------------+---------------------------------------------------------+ @@ -174,46 +104,21 @@ | patrol.py | Obtains a list pages and marks the edits as patrolled | | | based on a whitelist. | +------------------------+---------------------------------------------------------+ - | piper.py | Pipes article text through external program(s) on | - | | STDIN and collects its STDOUT which is used as the | - | | new article text if it differs from the original. | - +------------------------+---------------------------------------------------------+ - | protect.py | Protect and unprotect pages en masse. | - +------------------------+---------------------------------------------------------+ | redirect.py | Fix double redirects and broken redirects. Note: | | | solve_disambiguation also has functions which treat | | | redirects. | +------------------------+---------------------------------------------------------+ - | reflinks.py | Search for references which are only made of a link | - | | without title and fetch the html title from the link to | - | | use it as the title of the wiki link in the reference. | - +------------------------+---------------------------------------------------------+ | replace.py | Search articles for a text and replace it by another | | | text. Both text are set in two configurable | | | text files. The bot can either work on a set of given | | | pages or crawl an SQL dump. | +------------------------+---------------------------------------------------------+ - | replicate_wiki.py | Replicates pages in wiki to a second wiki within family| - +------------------------+---------------------------------------------------------+ | revertbot.py | Revert edits. | +------------------------+---------------------------------------------------------+ - | selflink.py | This bot goes over multiple pages of the home wiki, | - | | searches for selflinks, and allows removing them. | - +------------------------+---------------------------------------------------------+ | shell.py | Spawns an interactive Python shell | +------------------------+---------------------------------------------------------+ | solve_disambiguation.py| Interactive robot doing disambiguation. | +------------------------+---------------------------------------------------------+ - | spamremove.py | Remove links that are being or have been spammed. | - +------------------------+--+------------------------------------------------------+ - | standardize_interwiki.py | A robot that downloads a page, and reformats the | - | | interwiki links in a standard way (i.e. move all | - | | of them to the bottom or the top, with the same | - | | separator, in the right order). | - +------------------------+--+------------------------------------------------------+ - | states-redirect.py | A robot to add redirects to cities for state | - | | abbreviations. | - +------------------------+---------------------------------------------------------+ | speedy_delete.py | Help sysops to quickly check and/or delete pages listed | | | for speedy deletion. | +------------------------+---------------------------------------------------------+ @@ -226,10 +131,6 @@ | | [[Special:Statistics]] in a table on a wiki page. | | | Thus it creates and updates a statistics wikitable. | +------------------------+---+-----------------------------------------------------+ - | surnames_redirects.py | Bot to create redirects based on name order. | - +------------------------+---------------------------------------------------------+ - | table2wiki.py | Semi-automatic converting HTML-tables to wiki-tables | - +------------------------+---------------------------------------------------------+ | template.py | change one template (that is {{...}}) into another. | +------------------------+---------------------------------------------------------+ | templatecount.py | Display the list of pages transcluding a given list | @@ -240,34 +141,127 @@ +------------------------+---------------------------------------------------------+ | transferbot.py | Transfers pages from a source wiki to a target wiki | +------------------------+---------------------------------------------------------+ - | unlink.py | This bot unlinks a page on every page that links to it. | - +------------------------+---------------------------------------------------------+ - | unusedfiles.py | Bot appends some text to all unused images and other | - | | text to the respective uploaders. | - +------------------------+---------------------------------------------------------+ | upload.py | upload an image to a wiki. | +------------------------+---------------------------------------------------------+ | version.py | Outputs Pywikibot's revision number, Python's version | | | and OS used. | +------------------------+---------------------------------------------------------+ - | watchlists.py | Information retrieved by watchlist.py will be stored | - +------------------------+---------------------------------------------------------+ | weblinkchecker.py | Check if external links are still working. | +------------------------+---------------------------------------------------------+ | welcome.py | Script to welcome new users. | +------------------------+---------------------------------------------------------+ - | wikisourcetext.py | This bot applies to Wikisource sites to upload text. | - +------------------------+---------------------------------------------------------+ +------------------------+---------------------------------------------------------+ | archive | Scripts no longer maintained. | +========================+=========================================================+ - | cfd.py | Processes the categories for discussion working page. | - | | It parses out the actions that need to be taken as a | - | | result of CFD discussions and performs them. | + | blockpagechecker.py | Deletes any protection templates that are on pages | + | | which aren't actually protected. | +------------------------+---------------------------------------------------------+ - | featured.py | A robot to check feature articles. | + | capitalize_redirects.py| Script to create a redirect of capitalize articles. | + +------------------------+---------------------------------------------------------+ + | casechecker.py | Script to enumerate all pages in the wikipedia and | + | | find all titles with mixed Latin and Cyrillic | + | | alphabets. | + +------------------------+---------------------------------------------------------+ + | catall.py | Add or change categories on a number of pages. | + +------------------------+---------------------------------------------------------+ + | commons_link.py | This robot include commons template to linking Commons | + | | and your wiki project. | + +------------------------+---------------------------------------------------------+ + | commonscat.py | Adds {{commonscat}} to Wikipedia categories (or | + | | articles), if other language wikipedia already has such | + | | a template | + +------------------------+---------------------------------------------------------+ + | create_categories.py | Program to batch create categories. | + +------------------------+---------------------------------------------------------+ + | data_ingestion.py | A generic bot to do batch uploading to Commons. | + +------------------------+---------------------------------------------------------+ + | disambredir.py | Changing redirect names in disambiguation pages. | + +------------------------+---------------------------------------------------------+ + | djvutext.py | Extracts OCR text from djvu files and uploads onto | + | | pages in the "Page" namespace on Wikisource. | + +------------------------+---------------------------------------------------------+ + | editarticle.py | Edit a Wikipedia article with your favourite editor | + +------------------------+---------------------------------------------------------+ + | flickrripper.py | Upload images from Flickr easily. | + +------------------------+---------------------------------------------------------+ + | followlive.py | follow new articles on a wikipedia and flag them | + | | with a template. | + +------------------------++--------------------------------------------------------+ + | freebasemappingupload.py| Docstring fixes in scripts | + +------------------------++--------------------------------------------------------+ + | image.py | This script can be used to change one image to another | + | | or remove an image entirely. | + +------------------------+---------------------------------------------------------+ + | imagecopy.py | Copies images from a Wikimedia wiki to Commons | + +------------------------+---------------------------------------------------------+ + | imagecopy_self.py | Copy self published files from the English Wikipedia to | + | | Commons. | + +------------------------+---------------------------------------------------------+ + | imageharvest.py | Bot for getting multiple images from an external site. | + +------------------------+---------------------------------------------------------+ + | iamgerecat.py | Try to find categories for media on Commons. | + +------------------------+---------------------------------------------------------+ + | imageuncat.py | Adds uncat template to images without categories at | + | | Commons | + +------------------------+---------------------------------------------------------+ + | interwiki.py | A robot to check interwiki links on all pages (or | + | | a range of pages) of a wiki. | + +------------------------+---------------------------------------------------------+ + | isbn.py | Bot to convert all ISBN-10 codes to the ISBN-13 | + | | format. | + +------------------------+---------------------------------------------------------+ + | lonelypages.py | Place a template on pages which are not linked to by | + | | other pages, and are therefore lonely | + +------------------------+---------------------------------------------------------+ + | makecat.py | Given an existing or new category, find pages for that | + | | category. | + +------------------------+---------------------------------------------------------+ + | match_images.py | Match two images based on histograms. | + +------------------------+---------------------------------------------------------+ + | ndashredir.py | Creates hyphenated redirects to articles with n dash | + | | or m dash in their title. | + +------------------------+---------------------------------------------------------+ + | nowcommons.py | This bot can delete images with NowCommons template. | + +------------------------+---------------------------------------------------------+ + | piper.py | Pipes article text through external program(s) on | + | | STDIN and collects its STDOUT which is used as the | + | | new article text if it differs from the original. | + +------------------------+---------------------------------------------------------+ + | protect.py | Protect and unprotect pages en masse. | + +------------------------+---------------------------------------------------------+ + | reflinks.py | Search for references which are only made of a link | + | | without title and fetch the html title from the link to | + | | use it as the title of the wiki link in the reference. | + +------------------------+---------------------------------------------------------+ + | replicate_wiki.py | Replicates pages in wiki to a second wiki within family| + +------------------------+---------------------------------------------------------+ + | selflink.py | This bot goes over multiple pages of the home wiki, | + | | searches for selflinks, and allows removing them. | + +------------------------+---------------------------------------------------------+ + | spamremove.py | Remove links that are being or have been spammed. | + +------------------------+--+------------------------------------------------------+ + | standardize_interwiki.py | A robot that downloads a page, and reformats the | + | | interwiki links in a standard way (i.e. move all | + | | of them to the bottom or the top, with the same | + | | separator, in the right order). | + +------------------------+--+------------------------------------------------------+ + | states_redirect.py | A robot to add redirects to cities for state | + | | abbreviations. | + +------------------------+---------------------------------------------------------+ + | surnames_redirects.py | Bot to create redirects based on name order. | + +------------------------+---------------------------------------------------------+ + | table2wiki.py | Semi-automatic converting HTML-tables to wiki-tables | + +------------------------+---------------------------------------------------------+ + | unlink.py | This bot unlinks a page on every page that links to it. | + +------------------------+---------------------------------------------------------+ + | unusedfiles.py | Bot appends some text to all unused images and other | + | | text to the respective uploaders. | + +------------------------+---------------------------------------------------------+ + | watchlists.py | Information retrieved by watchlist.py will be stored | + +------------------------+---------------------------------------------------------+ + | wikisourcetext.py | This bot applies to Wikisource sites to upload text. | +------------------------+---------------------------------------------------------+ diff --git a/scripts/blockpageschecker.py b/scripts/archive/blockpageschecker.py similarity index 100% rename from scripts/blockpageschecker.py rename to scripts/archive/blockpageschecker.py diff --git a/scripts/capitalize_redirects.py b/scripts/archive/capitalize_redirects.py similarity index 100% rename from scripts/capitalize_redirects.py rename to scripts/archive/capitalize_redirects.py diff --git a/scripts/casechecker.py b/scripts/archive/casechecker.py similarity index 100% rename from scripts/casechecker.py rename to scripts/archive/casechecker.py diff --git a/scripts/catall.py b/scripts/archive/catall.py similarity index 100% rename from scripts/catall.py rename to scripts/archive/catall.py diff --git a/scripts/archive/cfd.py b/scripts/archive/cfd.py deleted file mode 100755 index 287c907..0000000 --- a/scripts/archive/cfd.py +++ /dev/null @@ -1,229 +0,0 @@ -#!/usr/bin/python -""" -This script processes the Categories for discussion working page. - -It parses out the actions that need to be taken as a result of CFD discussions -(as posted to the working page by an administrator) and performs them. - -Syntax: - - python pwb.py cfd - -""" -# -# (C) Pywikibot team, 2008-2020 -# -# Distributed under the terms of the MIT license. -# -import re -import sys - -import pywikibot - -from scripts.category import CategoryMoveRobot as CategoryMoveBot - - -DEFAULT_CFD_PAGE = 'Wikipedia:Categories for discussion/Working' - -# A list of templates that are used on category pages as part of the CFD -# process that contain information such as the link to the per-day discussion -# page. -cfd_templates = ['Cfd full', 'Cfr full'] - -# Regular expression declarations -# See the en-wiki CFD working page at -# [[Wikipedia:Categories for discussion/Working]] -# to see how these work in context. To get this bot working on other wikis you -# will need to adjust these regular expressions at the very least. -nobots = re.compile(r'NO\s*BOTS', re.IGNORECASE) -example = re.compile(r'\[\[:Category:(.)\1\1\1\1\]\]', re.IGNORECASE) -speedymode = re.compile(r'^===*\s*Speedy Moves\s*===*\s*$', re.IGNORECASE) -movemode = re.compile(r'^===*\s*Move/Merge then delete\s*===*\s*$', - re.IGNORECASE) -emptymode = re.compile(r'^===*\s*Empty then delete\s*===*\s*$', re.IGNORECASE) -deletemode = re.compile(r'^===*\s*Ready for deletion\s*===*\s*$', - re.IGNORECASE) -maintenance = re.compile( - r'^===*\s*Old by month categories with entries\s*===*\s*$', re.IGNORECASE) -dateheader = re.compile( - r'(\[\[Wikipedia:Categories[_ ]for[_ ]' - r'(?:discussion|deletion)/Log/([^\]]*?)\]\])', re.IGNORECASE) -movecat = re.compile( - (r'\[\[:Category:([^\]]*?)\]\][^\]]*?\[\[:Category:([^\]]*?)\]\]'), - re.IGNORECASE) -deletecat = re.compile(r'\[\[:Category:([^\]]*?)\]\]', re.IGNORECASE) -findday = re.compile(r'\[\[(Wikipedia:Categories for ' - r'(?:discussion|deletion)/Log/\d{4} \w+ \d+)#', - re.IGNORECASE) - - -class ReCheck: - - """Helper class.""" - - def __init__(self): - """Initializer.""" - self.result = None - - def check(self, pattern, text): - """Search pattern.""" - self.result = pattern.search(text) - return self.result - - -def main(*args): - """ - Process command line arguments and perform task. - - If args is an empty list, sys.argv is used. - - @param args: command line arguments - @type args: str - """ - cfd_page = DEFAULT_CFD_PAGE - local_args = pywikibot.handle_args(args) - - for arg in local_args: - if arg.startswith('-page'): - if len(arg) == len('-page'): - cfd_page = pywikibot.input( - 'Enter the CFD working page to use:') - else: - cfd_page = arg[len('-page:'):] - - page = pywikibot.Page(pywikibot.Site(), cfd_page) - try: - page.get() - except pywikibot.NoPage: - pywikibot.error( - 'CFD working page "{0}" does not exist!'.format(cfd_page)) - sys.exit(1) - - # Variable declarations - day = 'None' - mode = 'None' - summary = '' - robot = None - - m = ReCheck() - for line in page.text.split('\n'): - if nobots.search(line) or example.search(line): - # NO BOTS or example line - continue - if speedymode.search(line): - mode = 'Speedy' - day = 'None' - elif movemode.search(line): - mode = 'Move' - day = 'None' - elif emptymode.search(line): - mode = 'Empty' - day = 'None' - elif deletemode.search(line): - mode = 'Delete' - day = 'None' - elif maintenance.search(line): - # It's probably best not to try to handle these in an automated - # fashion. - mode = 'None' - day = 'None' - elif m.check(dateheader, line): - day = m.result.group(1) - pywikibot.output('Found day header: {}'.format(day)) - elif m.check(movecat, line): - src = m.result.group(1) - dest = m.result.group(2) - thisDay = findDay(src, day) - if mode == 'Move' and thisDay != 'None': - summary = ( - 'Robot - Moving category ' + src + ' to [[:Category:' - + dest + ']] per [[WP:CFD|CFD]] at ' + thisDay + '.') - action_summary = \ - 'Robot - Result of [[WP:CFD|CFD]] at ' + thisDay + '.' - elif mode == 'Speedy': - summary = ( - 'Robot - Speedily moving category ' + src - + ' to [[:Category:' + dest + ']] per [[WP:CFDS|CFDS]].') - action_summary = 'Robot - Speedily moved per [[WP:CFDS|CFDS]].' - else: - continue - # If the category is redirect, we do NOT want to move articles to - # it. The safest thing to do here is abort and wait for human - # intervention. - destpage = pywikibot.Page(page.site, dest, ns=14) - if destpage.isCategoryRedirect(): - summary = 'CANCELED. Destination is redirect: ' + summary - pywikibot.stdout(summary) - robot = None - else: - deletion_comment_same = ( - CategoryMoveBot.DELETION_COMMENT_SAME_AS_EDIT_COMMENT) - robot = CategoryMoveBot(oldcat=src, newcat=dest, batch=True, - comment=summary, inplace=True, - move_oldcat=True, delete_oldcat=True, - deletion_comment=deletion_comment_same, - move_comment=action_summary) - elif m.check(deletecat, line): - src = m.result.group(1) - # I currently don't see any reason to handle these two cases - # separately, though if are guaranteed that the category in the - # "Delete" case is empty, it might be easier to call delete.py on - # it. - thisDay = findDay(src, day) - if (mode == 'Empty' or mode == 'Delete') and thisDay != 'None': - summary = ( - 'Robot - Removing category {0} per [[WP:CFD|CFD]] ' - 'at {1}.'.format(src, thisDay)) - action_summary = \ - 'Robot - Result of [[WP:CFD|CFD]] at ' + thisDay + '.' - else: - continue - robot = CategoryMoveBot(oldcat=src, batch=True, comment=summary, - deletion_comment=action_summary, - inplace=True) - if summary and robot is not None: - pywikibot.stdout(summary) - # Run, robot, run! - robot.run() - summary = '' - robot = None - - -def findDay(pageTitle, oldDay): - """ - Find day link from CFD template. - - This function grabs the wiki source of a category page and attempts to - extract a link to the CFD per-day discussion page from the CFD template. - If the CFD template is not there, it will return the value of the second - parameter, which is essentially a fallback that is extracted from the - per-day subheadings on the working page. - """ - page = pywikibot.Page(pywikibot.Site(), 'Category:' + pageTitle) - try: - pageSrc = page.text - except pywikibot.NoPage: - m = None - else: - m = findday.search(pageSrc) - - if m is not None: - return '[[{}]]'.format(m.group(1)) - - # Try to parse day link from CFD template parameters. - templates = page.templatesWithParams() - for template, params in templates: - if template.title() in cfd_templates: - period = {'year': None, 'day': None, 'month': None} - for param in params: - name, _, val = param.partition('=') - if name in period: - period[name] = val - if all(period.values()): - return ('[[Wikipedia:Categories for discussion/Log/' - '{year} {month} {day}]]'.format(**period)) - return oldDay - - -if __name__ == '__main__': - main() diff --git a/scripts/commons_link.py b/scripts/archive/commons_link.py similarity index 100% rename from scripts/commons_link.py rename to scripts/archive/commons_link.py diff --git a/scripts/commonscat.py b/scripts/archive/commonscat.py similarity index 100% rename from scripts/commonscat.py rename to scripts/archive/commonscat.py diff --git a/scripts/create_categories.py b/scripts/archive/create_categories.py similarity index 100% rename from scripts/create_categories.py rename to scripts/archive/create_categories.py diff --git a/scripts/data_ingestion.py b/scripts/archive/data_ingestion.py similarity index 100% rename from scripts/data_ingestion.py rename to scripts/archive/data_ingestion.py diff --git a/scripts/disambredir.py b/scripts/archive/disambredir.py similarity index 100% rename from scripts/disambredir.py rename to scripts/archive/disambredir.py diff --git a/scripts/djvutext.py b/scripts/archive/djvutext.py similarity index 100% rename from scripts/djvutext.py rename to scripts/archive/djvutext.py diff --git a/scripts/editarticle.py b/scripts/archive/editarticle.py similarity index 100% rename from scripts/editarticle.py rename to scripts/archive/editarticle.py diff --git a/scripts/archive/featured.py b/scripts/archive/featured.py deleted file mode 100755 index 2e24ff8..0000000 --- a/scripts/archive/featured.py +++ /dev/null @@ -1,630 +0,0 @@ -#!/usr/bin/python -""" -Manage featured/good article/list status template. - -*** This script understands various command-line arguments: *** - -Task commands: - - -featured use this script for featured articles. Default task - if no task command is specified - - -good use this script for good articles. - - -lists use this script for featured lists. - - -former use this script for removing {{Link FA|xx}} from former - fearured articles - - NOTE: you may have all of these commands in one run - -Option commands: - - -interactive: ask before changing each page - - -nocache doesn't include cache files file to remember if the article - already was verified. - - -nocache:xx,yy you may ignore language codes xx,yy,... from cache file - - -fromlang:xx,yy xx,yy,zz,.. are the languages to be verified. - -fromlang:ar--fi Another possible with range the languages - - -fromall to verify all languages. - - -tolang:xx,yy xx,yy,zz,.. are the languages to be updated - - -after:zzzz process pages after and including page zzzz - (sorry, not implemented yet) - - -side use -side if you want to move all {{Link FA|lang}} next - to the corresponding interwiki links. Default is placing - {{Link FA|lang}} on top of the interwiki links. - (This option is deprecated with wikidata) - - -count Only counts how many featured/good articles exist - on all wikis (given with the "-fromlang" argument) or - on several language(s) (when using the "-fromall" argument). - Example: python pwb.py featured -fromlang:en,he -count - counts how many featured articles exist in the en and he - wikipedias. - - -quiet no corresponding pages are displayed. - -""" -# -# (C) Pywikibot team, 2005-2020 -# -# Distributed under the terms of the MIT license. -# -import pickle -import re - -import pywikibot - -from pywikibot import i18n, textlib, config - -from pywikibot.pagegenerators import PreloadingGenerator -from pywikibot.tools.formatter import color_format -from pywikibot.tools import issue_deprecation_warning - - -def CAT(site, name, hide): - name = site.namespace(14) + ':' + name - cat = pywikibot.Category(site, name) - yield from cat.articles(endsort=hide) - if hide: - yield from cat.articles(startFrom=chr(ord(hide) + 1)) - - -def BACK(site, name, hide): - p = pywikibot.Page(site, name, ns=10) - return [page for page in p.getReferences(follow_redirects=False, - only_template_inclusion=True)] - - -def DATA(site, name, hide): - dp = pywikibot.ItemPage(site.data_repository(), name) - try: - title = dp.getSitelink(site) - except pywikibot.NoPage: - return - cat = pywikibot.Category(site, title) - if isinstance(hide, dict): - hide = hide.get(site.code) - yield from cat.articles(endsort=hide) - if hide: - yield from cat.articles(startsort=chr(ord(hide) + 1)) - - -# not implemented yet -def TMPL(site, name, hide): - return - - -# ALL wikis use 'Link FA', and sometimes other localized templates. -# We use _default AND the localized ones -template = { - '_default': ['Link FA'], - 'als': ['LinkFA'], - 'an': ['Destacato', 'Destacau'], - 'ar': ['وصلة مقالة مختارة'], - 'ast': ['Enllaz AD'], - 'az': ['Link FM'], - 'br': ['Liamm PuB', 'Lien AdQ'], - 'ca': ['Enllaç AD', 'Destacat'], - 'cy': ['Cyswllt erthygl ddethol', 'Dolen ED'], - 'eo': ['LigoElstara'], - 'en': ['Link FA', 'FA link'], - 'es': ['Destacado'], - 'eu': ['NA lotura'], - 'fr': ['Lien AdQ'], - 'fur': ['Leam VdC'], - 'ga': ['Nasc AR'], - 'gl': ['Ligazón AD', 'Destacado'], - 'hi': ['Link FA', 'Lien AdQ'], - 'is': ['Tengill ÚG'], - 'it': ['Link V', 'Link AdQ'], - 'no': ['Link UA'], - 'oc': ['Ligam AdQ', 'Lien AdQ'], - 'ro': ['Legătură AC', 'Legătură AF'], - 'sv': ['UA', 'Link UA'], - 'tr': ['Link SM'], - 'vi': ['Liên kết chọn lọc'], - 'vo': ['Yüm YG'], - 'yi': ['רא'], -} - -template_good = { - '_default': ['Link GA'], - 'ar': ['وصلة مقالة جيدة'], - 'ca': ['Enllaç AB', 'Lien BA', 'Abo'], - 'da': ['Link GA', 'Link AA'], - 'eo': ['LigoLeginda'], - 'es': ['Bueno'], - 'fr': ['Lien BA'], - 'gl': ['Ligazón AB'], - 'is': ['Tengill GG'], - 'it': ['Link VdQ'], - 'nn': ['Link AA'], - 'no': ['Link AA'], - 'pt': ['Bom interwiki'], - # 'tr': ['Link GA', 'Link KM'], - 'vi': ['Liên kết bài chất lượng tốt'], - 'wo': ['Lien BA'], -} - -template_lists = { - '_default': ['Link FL'], - 'no': ['Link GL'], -} - -featured_name = { - 'wikidata': (DATA, 'Q4387444'), -} - -good_name = { - 'wikidata': (DATA, 'Q7045856'), -} - -lists_name = { - 'wikidata': (TMPL, 'Q5857568'), - 'ar': (BACK, 'قائمة مختارة'), - 'da': (BACK, 'FremragendeListe'), - 'de': (BACK, 'Informativ'), - 'en': (BACK, 'Featured list'), - 'fa': (BACK, 'فهرست برگزیده'), - 'id': (BACK, 'Featured list'), - 'ja': (BACK, 'Featured List'), - 'ksh': (CAT, 'Joode Leß'), - 'no': (BACK, 'God liste'), - 'pl': (BACK, 'Medalista'), - 'pt': (BACK, 'Anexo destacado'), - 'ro': (BACK, 'Listă de calitate'), - 'ru': (BACK, 'Избранный список или портал'), - 'tr': (BACK, 'Seçkin liste'), - 'uk': (BACK, 'Вибраний список'), - 'vi': (BACK, 'Sao danh sách chọn lọc'), - 'zh': (BACK, '特色列表'), -} - -# Third parameter is the sort key indicating articles to hide from the given -# list -former_name = { - 'wikidata': (DATA, 'Q7045853', {'en': '#'}) -} - - -class FeaturedBot(pywikibot.Bot): - - """Featured article bot.""" - - # Bot configuration. - # Only the keys of the dict can be passed as init options - # The values are the default values - - def __init__(self, **kwargs): - """Only accepts options defined in availableOptions.""" - self.availableOptions.update({ - 'async': False, # True for asynchronously putting a page - 'afterpage': '!', - 'count': False, # featuredcount - 'featured': False, - 'former': False, - 'fromall': False, - 'fromlang': None, - 'good': False, - 'lists': False, - 'nocache': [], - 'side': False, # not template_on_top - 'quiet': False, - 'interactive': False, - }) - - super().__init__(**kwargs) - self.cache = {} - self.filename = None - self.site = pywikibot.Site() - self.repo = self.site.data_repository() - - # if no source site is given, give up - if self.getOption('fromlang') is True: - self.options['fromlang'] = False - - # setup tasks running - self.tasks = [] - for task in ('featured', 'good', 'lists', 'former'): - if self.getOption(task): - self.tasks.append(task) - if not self.tasks: - self.tasks = ['featured'] - - def itersites(self, task): - """Generator for site codes to be processed.""" - def _generator(): - if task == 'good': - item_no = good_name['wikidata'][1] - elif task == 'featured': - item_no = featured_name['wikidata'][1] - elif task == 'former': - item_no = former_name['wikidata'][1] - dp = pywikibot.ItemPage(self.repo, item_no) - dp.get() - for key in sorted(dp.sitelinks.keys()): - try: - site = self.site.fromDBName(key) - except pywikibot.SiteDefinitionError: - pywikibot.output('"%s" is not a valid site. Skipping...' - % key) - else: - if site.family == self.site.family: - yield site - - generator = _generator() - - if self.getOption('fromall'): - return generator - elif self.getOption('fromlang'): - fromlang = self.getOption('fromlang') - if len(fromlang) == 1 and fromlang[0].find('--') >= 0: - start, end = fromlang[0].split('--', 1) - if not start: - start = '' - if not end: - end = 'zzzzzzz' - return (site for site in generator - if site.code >= start and site.code <= end) - else: - return (site for site in generator if site.code in fromlang) - else: - pywikibot.warning('No sites given to verify %s articles.\n' - 'Please use -fromlang: or fromall option\n' - % task) - return () - - def hastemplate(self, task): - add_tl, remove_tl = self.getTemplateList(self.site.code, task) - for i, tl in enumerate(add_tl): - tp = pywikibot.Page(self.site, tl, ns=10) - if tp.exists(): - return True - else: - pywikibot.output(tl + ' does not exist') - # The first item is the default template to be added. - # It must exist. Otherwise the script must not run. - if i == 0: - return - else: - return - - def readcache(self, task): - if self.getOption('count') or self.getOption('nocache') is True: - return - self.filename = pywikibot.config.datafilepath('cache', task) - try: - f = open(self.filename, 'rb') - self.cache = pickle.load(f) - f.close() - pywikibot.output('Cache file %s found with %d items.' - % (self.filename, len(self.cache))) - except IOError: - pywikibot.output('Cache file %s not found.' % self.filename) - - def writecache(self): - if self.getOption('count'): - return - if not self.getOption('nocache') is True: - pywikibot.output('Writing %d items to cache file %s.' - % (len(self.cache), self.filename)) - with open(self.filename, 'wb') as f: - pickle.dump(self.cache, f, protocol=config.pickle_protocol) - self.cache = {} - - def run(self): - for task in self.tasks: - self.run_task(task) - pywikibot.output('%d pages written.' % self._save_counter) - - def run_task(self, task): - if not self.hastemplate(task): - pywikibot.output('\nNOTE: %s articles are not implemented at %s.' - % (task, self.site)) - return - - self.readcache(task) - for site in self.itersites(task): - try: - self.treat(site, task) - except KeyboardInterrupt: - pywikibot.output('\nQuitting %s treat...' % task) - break - self.writecache() - - def treat(self, fromsite, task): - if fromsite != self.site: - self.featuredWithInterwiki(fromsite, task) - - def featuredArticles(self, site, task, cache): - articles = [] - info = globals()[task + '_name'] - if task == 'lists': - code = site.code - else: - code = 'wikidata' - try: - method = info[code][0] - except KeyError: - pywikibot.error( - "language %s doesn't has %s category source." - % (code, task)) - return - name = info[code][1] - # hide #-sorted items on en-wiki - try: - hide = info[code][2] - except IndexError: - hide = None - for p in method(site, name, hide): - if p.namespace() == 0: # Article - articles.append(p) - # Article talk (like in English) - elif p.namespace() == 1 and site.code != 'el': - articles.append(pywikibot.Page(p.site, - p.title(with_ns=False))) - pywikibot.output(color_format( - '{lightred}** {0} has {1} {2} articles{default}', - site, len(articles), task)) - while articles: - p = articles.pop(0) - if p.title() < self.getOption('afterpage'): - continue - - if '/' in p.title() and p.namespace() != 0: - pywikibot.output('%s is a subpage' % p.title()) - continue - - if p.title() in cache: - pywikibot.output('(cached) %s -> %s' % ( - p.title(), cache[p.title()])) - continue - yield p - - def findTranslated(self, page, oursite=None): - quiet = self.getOption('quiet') - if not oursite: - oursite = self.site - if page.isRedirectPage(): - page = page.getRedirectTarget() - - ourpage = None - for link in page.iterlanglinks(): - if link.site == oursite: - ourpage = pywikibot.Page(link) - break - - if not ourpage: - if not quiet: - pywikibot.output('%s -> no corresponding page in %s' - % (page.title(), oursite)) - elif ourpage.section(): - pywikibot.output('%s -> our page is a section link: %s' - % (page.title(), ourpage.title())) - elif not ourpage.exists(): - pywikibot.output("%s -> our page doesn't exist: %s" - % (page.title(), ourpage.title())) - else: - if ourpage.isRedirectPage(): - ourpage = ourpage.getRedirectTarget() - - pywikibot.output('%s -> corresponding page is %s' - % (page.title(), ourpage.title())) - if ourpage.namespace() != 0: - pywikibot.output('%s -> not in the main namespace, skipping' - % page.title()) - elif ourpage.isRedirectPage(): - pywikibot.output( - '%s -> double redirect, skipping' % page.title()) - elif not ourpage.exists(): - pywikibot.output("%s -> page doesn't exist, skipping" - % ourpage.title()) - else: - backpage = None - for link in ourpage.iterlanglinks(): - if link.site == page.site: - backpage = pywikibot.Page(link) - break - if not backpage: - pywikibot.output( - '%s -> no back interwiki ref' % page.title()) - elif backpage == page: - # everything is ok - yield ourpage - elif backpage.isRedirectPage(): - backpage = backpage.getRedirectTarget() - if backpage == page: - # everything is ok - yield ourpage - else: - pywikibot.output( - '%s -> back interwiki ref target is redirect to %s' - % (page.title(), backpage.title())) - else: - pywikibot.output('%s -> back interwiki ref target is %s' - % (page.title(), backpage.title())) - - def getTemplateList(self, code, task): - add_templates = [] - remove_templates = [] - if task == 'featured': - try: - add_templates = template[code] - add_templates += template['_default'] - except KeyError: - add_templates = template['_default'] - try: - remove_templates = template_good[code] - remove_templates += template_good['_default'] - except KeyError: - remove_templates = template_good['_default'] - elif task == 'good': - try: - add_templates = template_good[code] - add_templates += template_good['_default'] - except KeyError: - add_templates = template_good['_default'] - try: - remove_templates = template[code] - remove_templates += template['_default'] - except KeyError: - remove_templates = template['_default'] - elif task == 'lists': - try: - add_templates = template_lists[code] - add_templates += template_lists['_default'] - except KeyError: - add_templates = template_lists['_default'] - else: # task == 'former' - try: - remove_templates = template[code] - remove_templates += template['_default'] - except KeyError: - remove_templates = template['_default'] - return add_templates, remove_templates - - def featuredWithInterwiki(self, fromsite, task): - """Read featured articles and find the corresponding pages. - - Find corresponding pages on other sites, place the template and - remember the page in the cache dict. - - """ - tosite = self.site - if fromsite.code not in self.cache: - self.cache[fromsite.code] = {} - if tosite.code not in self.cache[fromsite.code]: - self.cache[fromsite.code][tosite.code] = {} - cc = self.cache[fromsite.code][tosite.code] - if self.getOption('nocache') is True or \ - fromsite.code in self.getOption('nocache'): - cc = {} - - gen = self.featuredArticles(fromsite, task, cc) - if self.getOption('count'): - next(gen, None) - return # count only, we are ready here - gen = PreloadingGenerator(gen) - - for source in gen: - if source.isRedirectPage(): - source = source.getRedirectTarget() - - if not source.exists(): - pywikibot.output("source page doesn't exist: %s" - % source) - continue - - for dest in self.findTranslated(source, tosite): - self.add_template(source, dest, task, fromsite) - cc[source.title()] = dest.title() - - def add_template(self, source, dest, task, fromsite): - """Place or remove the Link_GA/FA template on/from a page.""" - def compile_link(site, templates): - """Compile one link template list.""" - findtemplate = '(%s)' % '|'.join(templates) - return re.compile(r'\{\{%s\|%s\}\}' - % (findtemplate.replace(' ', '[ _]'), - site.code), re.IGNORECASE) - - tosite = dest.site - add_tl, remove_tl = self.getTemplateList(tosite.code, task) - re_link_add = compile_link(fromsite, add_tl) - re_link_remove = compile_link(fromsite, remove_tl) - - text = dest.text - m1 = add_tl and re_link_add.search(text) - m2 = remove_tl and re_link_remove.search(text) - changed = False - interactive = self.getOption('interactive') - if add_tl: - if m1: - pywikibot.output('(already added)') - else: - # insert just before interwiki - if (not interactive - or pywikibot.input_yn( - 'Connecting %s -> %s. Proceed?' - % (source.title(), dest.title()), - default=False, automatic_quit=False)): - if self.getOption('side'): - # Placing {{Link FA|xx}} right next to - # corresponding interwiki - text = (text[:m1.end()] - + ' {{%s|%s}}' % (add_tl[0], fromsite.code) - + text[m1.end():]) - else: - # Moving {{Link FA|xx}} to top of interwikis - iw = textlib.getLanguageLinks(text, tosite) - text = textlib.removeLanguageLinks(text, tosite) - text += '%s{{%s|%s}}%s' % ( - config.LS, add_tl[0], fromsite.code, config.LS) - text = textlib.replaceLanguageLinks(text, - iw, tosite) - changed = True - if remove_tl: - if m2: - if (changed # Don't force the user to say "Y" twice - or not interactive - or pywikibot.input_yn( - 'Connecting %s -> %s. Proceed?' - % (source.title(), dest.title()), - default=False, automatic_quit=False)): - text = re.sub(re_link_remove, '', text) - changed = True - elif task == 'former': - pywikibot.output('(already removed)') - if changed: - comment = i18n.twtranslate(tosite, 'featured-' + task, - {'page': source}) - try: - dest.put(text, comment) - self._save_counter += 1 - except pywikibot.LockedPage: - pywikibot.output('Page %s is locked!' - % dest.title()) - except pywikibot.PageSaveRelatedError: - pywikibot.output('Page not saved') - - -def main(*args): - """ - Process command line arguments and invoke bot. - - If args is an empty list, sys.argv is used. - - @param args: command line arguments - @type args: str - """ - options = {} - local_args = pywikibot.handle_args(args) - - issue_deprecation_warning( - 'featured.py script', 'Wikibase Client extension', - 0, UserWarning, since='20160307') - - for arg in local_args: - if arg.startswith('-fromlang:'): - options[arg[1:9]] = arg[10:].split(',') - elif arg.startswith('-after:'): - options['afterpage'] = arg[7:] - elif arg.startswith('-nocache:'): - options[arg[1:8]] = arg[9:].split(',') - else: - options[arg[1:].lower()] = True - - bot = FeaturedBot(**options) - bot.run() - - -if __name__ == '__main__': - main() diff --git a/scripts/flickrripper.py b/scripts/archive/flickrripper.py similarity index 100% rename from scripts/flickrripper.py rename to scripts/archive/flickrripper.py diff --git a/scripts/followlive.py b/scripts/archive/followlive.py similarity index 100% rename from scripts/followlive.py rename to scripts/archive/followlive.py diff --git a/scripts/freebasemappingupload.py b/scripts/archive/freebasemappingupload.py similarity index 100% rename from scripts/freebasemappingupload.py rename to scripts/archive/freebasemappingupload.py diff --git a/scripts/image.py b/scripts/archive/image.py similarity index 100% rename from scripts/image.py rename to scripts/archive/image.py diff --git a/scripts/imagecopy.py b/scripts/archive/imagecopy.py similarity index 100% rename from scripts/imagecopy.py rename to scripts/archive/imagecopy.py diff --git a/scripts/imagecopy_self.py b/scripts/archive/imagecopy_self.py similarity index 100% rename from scripts/imagecopy_self.py rename to scripts/archive/imagecopy_self.py diff --git a/scripts/imageharvest.py b/scripts/archive/imageharvest.py similarity index 100% rename from scripts/imageharvest.py rename to scripts/archive/imageharvest.py diff --git a/scripts/imagerecat.py b/scripts/archive/imagerecat.py similarity index 100% rename from scripts/imagerecat.py rename to scripts/archive/imagerecat.py diff --git a/scripts/imageuncat.py b/scripts/archive/imageuncat.py similarity index 100% rename from scripts/imageuncat.py rename to scripts/archive/imageuncat.py diff --git a/scripts/interwiki.py b/scripts/archive/interwiki.py similarity index 100% rename from scripts/interwiki.py rename to scripts/archive/interwiki.py diff --git a/scripts/isbn.py b/scripts/archive/isbn.py similarity index 100% rename from scripts/isbn.py rename to scripts/archive/isbn.py diff --git a/scripts/lonelypages.py b/scripts/archive/lonelypages.py similarity index 100% rename from scripts/lonelypages.py rename to scripts/archive/lonelypages.py diff --git a/scripts/makecat.py b/scripts/archive/makecat.py similarity index 100% rename from scripts/makecat.py rename to scripts/archive/makecat.py diff --git a/scripts/match_images.py b/scripts/archive/match_images.py similarity index 100% rename from scripts/match_images.py rename to scripts/archive/match_images.py diff --git a/scripts/ndashredir.py b/scripts/archive/ndashredir.py similarity index 100% rename from scripts/ndashredir.py rename to scripts/archive/ndashredir.py diff --git a/scripts/nowcommons.py b/scripts/archive/nowcommons.py similarity index 100% rename from scripts/nowcommons.py rename to scripts/archive/nowcommons.py diff --git a/scripts/patrol.py b/scripts/archive/patrol.py similarity index 100% rename from scripts/patrol.py rename to scripts/archive/patrol.py diff --git a/scripts/piper.py b/scripts/archive/piper.py similarity index 100% rename from scripts/piper.py rename to scripts/archive/piper.py diff --git a/scripts/reflinks.py b/scripts/archive/reflinks.py similarity index 100% rename from scripts/reflinks.py rename to scripts/archive/reflinks.py diff --git a/scripts/replicate_wiki.py b/scripts/archive/replicate_wiki.py similarity index 100% rename from scripts/replicate_wiki.py rename to scripts/archive/replicate_wiki.py diff --git a/scripts/selflink.py b/scripts/archive/selflink.py similarity index 100% rename from scripts/selflink.py rename to scripts/archive/selflink.py diff --git a/scripts/spamremove.py b/scripts/archive/spamremove.py similarity index 100% rename from scripts/spamremove.py rename to scripts/archive/spamremove.py diff --git a/scripts/standardize_interwiki.py b/scripts/archive/standardize_interwiki.py similarity index 100% rename from scripts/standardize_interwiki.py rename to scripts/archive/standardize_interwiki.py diff --git a/scripts/states_redirect.py b/scripts/archive/states_redirect.py similarity index 100% rename from scripts/states_redirect.py rename to scripts/archive/states_redirect.py diff --git a/scripts/surnames_redirects.py b/scripts/archive/surnames_redirects.py similarity index 100% rename from scripts/surnames_redirects.py rename to scripts/archive/surnames_redirects.py diff --git a/scripts/table2wiki.py b/scripts/archive/table2wiki.py similarity index 100% rename from scripts/table2wiki.py rename to scripts/archive/table2wiki.py diff --git a/scripts/unlink.py b/scripts/archive/unlink.py similarity index 100% rename from scripts/unlink.py rename to scripts/archive/unlink.py diff --git a/scripts/unusedfiles.py b/scripts/archive/unusedfiles.py similarity index 100% rename from scripts/unusedfiles.py rename to scripts/archive/unusedfiles.py diff --git a/scripts/watchlist.py b/scripts/archive/watchlist.py similarity index 100% rename from scripts/watchlist.py rename to scripts/archive/watchlist.py diff --git a/scripts/wikisourcetext.py b/scripts/archive/wikisourcetext.py similarity index 100% rename from scripts/wikisourcetext.py rename to scripts/archive/wikisourcetext.py diff --git a/scripts/interwikidata.py b/scripts/interwikidata.py index acf398d..073ca0d 100755 --- a/scripts/interwikidata.py +++ b/scripts/interwikidata.py @@ -61,9 +61,8 @@ }) super().__init__(**kwargs) if not self.site.has_data_repository: - raise ValueError('{site} does not have a data repository, ' - 'use interwiki.py instead.'.format( - site=self.site)) + raise ValueError('{site} does not have a data repository.' + .format(site=self.site)) self.repo = self.site.data_repository() if not self.opt.summary: self.opt.summary = pywikibot.i18n.twtranslate( diff --git a/tests/__init__.py b/tests/__init__.py index 1da2957..aad974c 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -136,21 +136,15 @@ 'category_bot', 'checkimages', 'compat2core', - 'data_ingestion', 'deletionbot', - 'disambredir', 'fixing_redirects', 'generate_family_file', 'generate_user_files', - 'imagecopy', 'interwikidata', - 'isbn', 'l10n', - 'patrolbot', 'protectbot', 'pwb', 'redirect_bot', - 'reflinks', 'replacebot', 'script', 'template_bot', diff --git a/tests/data_ingestion_tests.py b/tests/archive/data_ingestion_tests.py similarity index 100% rename from tests/data_ingestion_tests.py rename to tests/archive/data_ingestion_tests.py diff --git a/tests/disambredir_tests.py b/tests/archive/disambredir_tests.py similarity index 100% rename from tests/disambredir_tests.py rename to tests/archive/disambredir_tests.py diff --git a/tests/imagecopy_tests.py b/tests/archive/imagecopy_tests.py similarity index 100% rename from tests/imagecopy_tests.py rename to tests/archive/imagecopy_tests.py diff --git a/tests/isbn_tests.py b/tests/archive/isbn_tests.py similarity index 100% rename from tests/isbn_tests.py rename to tests/archive/isbn_tests.py diff --git a/tests/patrolbot_tests.py b/tests/archive/patrolbot_tests.py similarity index 100% rename from tests/patrolbot_tests.py rename to tests/archive/patrolbot_tests.py diff --git a/tests/reflinks_tests.py b/tests/archive/reflinks_tests.py similarity index 100% rename from tests/reflinks_tests.py rename to tests/archive/reflinks_tests.py diff --git a/tests/pwb_tests.py b/tests/pwb_tests.py index 89ccc1b..07baafe 100644 --- a/tests/pwb_tests.py +++ b/tests/pwb_tests.py @@ -104,6 +104,7 @@ with self.subTest(line=2): self.assertEqual(stderr.readline().strip(), result[2]) + @unittest.skip('No multiple results currently') def test_similar_scripts_found(self): """Test script call which gives multiple similar results.""" result = [ diff --git a/tests/script_tests.py b/tests/script_tests.py index cc2942d..774b605 100644 --- a/tests/script_tests.py +++ b/tests/script_tests.py @@ -86,29 +86,16 @@ } auto_run_script_list = [ - 'blockpageschecker', - 'casechecker', - 'catall', 'category_redirect', 'checkimages', 'clean_sandbox', - 'disambredir', - 'followlive', - 'imagerecat', 'login', - 'lonelypages', 'misspelling', 'revertbot', 'noreferences', - 'nowcommons', 'parser_function_count', - 'patrol', 'shell', - 'standardize_interwiki', - 'states_redirect', - 'unusedfiles', 'upload', - 'watchlist', 'welcome', ] diff --git a/tox.ini b/tox.ini index e2f6b21..2ba602f 100644 --- a/tox.ini +++ b/tox.ini @@ -34,7 +34,7 @@ fasttest: python -W error::UserWarning -m generate_user_files -family:wikipedia -lang:test -v fasttest: nosetests --version - fasttest: nosetests --with-detecthttp -v -a '!net' tests + fasttest: nosetests --with-detecthttp --ignore-files="archive/.+" -v -a '!net' tests deps = flake8: .[flake8] @@ -99,7 +99,7 @@ ignore = B007,C103,D105,D211,D401,D413,D412,FI1,H101,H238,H301,H404,H405,H903,P101,P102,P103,P205,W503 select = B901,B903 enable-extensions = H203,H204,H205 -exclude = .tox,.git,./*.egg,build,scripts/archive/*,./scripts/i18n/* +exclude = .tox,.git,./*.egg,build,scripts/archive/*,./scripts/i18n/*,./tests/archive/* classmethod-decorators = classmethod,classproperty # flake8-coding @@ -166,43 +166,25 @@ pywikibot/userinterfaces/win32_unicode.py : N801, N812, T001, N803, N806 pywikibot/xmlreader.py : N803, N806, N802 scripts/add_text.py : N803, N806 - scripts/blockpageschecker.py : N802, N803, N806, N816 - scripts/casechecker.py : N802, N803, N806, N815 scripts/category.py : N803, N806, N802 scripts/category_redirect.py : N803, N806, N802 scripts/checkimages.py : N801, N802, N803, N806, N816 scripts/clean_sandbox.py : N815, N816 - scripts/commonscat.py : N802, N803, N806, N816 scripts/cosmetic_changes.py : N816 - scripts/data_ingestion.py : N803, N806, N802 scripts/fixing_redirects.py : N803, N806 - scripts/flickrripper.py : N803, N806, N802 - scripts/freebasemappingupload.py: N802 scripts/harvest_template.py : N802, N815, N816 - scripts/imagecopy.py : N801, N802, N803, N806, N816 - scripts/imagecopy_self.py : N801, N802, N803, N806, N816 - scripts/imagerecat.py : N803, N806, N802 scripts/imagetransfer.py : N803, N806, N816 - scripts/imageuncat.py: N802, 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 - scripts/match_images.py : N803, N806 scripts/misspelling.py : N802, N803, N806, N815 scripts/movepages.py : N803, N806, N802 scripts/noreferences.py : N802, N803, N806, N816 - scripts/nowcommons.py : N802, N803, N806, N816 scripts/pagefromfile.py : N815 scripts/redirect.py : N803, N806, N815 - scripts/reflinks.py: N802, N816 scripts/replace.py : N802, N803, N806, N816 scripts/revertbot.py: N815 scripts/solve_disambiguation.py : N803, N806, N802 - scripts/table2wiki.py: N802 scripts/templatecount.py: N802 - scripts/unlink.py : N803 - scripts/watchlist.py : N803, N802 scripts/weblinkchecker.py : N803, N806, N802 scripts/welcome.py: N802, N815 setup.py : T001 -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/660644 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: Ic694a413623b7e2ffed9cc7e8d64d191df3c1248 Gerrit-Change-Number: 660644 Gerrit-PatchSet: 10 Gerrit-Owner: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 2 months

[Gerrit] ...core[master]: [cleanup] Remove coding hint

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/665073 ) Change subject: [cleanup] Remove coding hint ...................................................................... [cleanup] Remove coding hint Change-Id: I3bbdcd11664317e33995271c24bc3df6ac52ca87 --- M pywikibot/site/__init__.py 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site/__init__.py b/pywikibot/site/__init__.py index 8346839..59f71fd 100644 --- a/pywikibot/site/__init__.py +++ b/pywikibot/site/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- """Library module representing MediaWiki sites (wikis).""" # # (C) Pywikibot team, 2021 -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/665073 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: I3bbdcd11664317e33995271c24bc3df6ac52ca87 Gerrit-Change-Number: 665073 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, 2 months

[Gerrit] ...core[master]: Changes import preferences for unittest

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/664582 ) Change subject: Changes import preferences for unittest ...................................................................... Changes import preferences for unittest Bug: T272235 Change-Id: I6b160d12071e0d3c86d680dadd069fd3489eb362 --- M tests/pwb_tests.py M tests/wikibase_edit_tests.py 2 files changed, 3 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/pwb_tests.py b/tests/pwb_tests.py index 011d6d7..298666d 100644 --- a/tests/pwb_tests.py +++ b/tests/pwb_tests.py @@ -16,7 +16,7 @@ from tests import join_tests_path, create_path_func from tests.utils import execute, execute_pwb -from tests.aspects import unittest, PwbTestCase +from tests.aspects import PwbTestCase join_pwb_tests_path = create_path_func(join_tests_path, 'pwb') diff --git a/tests/wikibase_edit_tests.py b/tests/wikibase_edit_tests.py index e0ba7de..fa03f79 100644 --- a/tests/wikibase_edit_tests.py +++ b/tests/wikibase_edit_tests.py @@ -10,12 +10,13 @@ # Distributed under the terms of the MIT license. # import time +import unittest from contextlib import suppress import pywikibot -from tests.aspects import unittest, WikibaseTestCase +from tests.aspects import WikibaseTestCase class TestWikibaseWriteGeneral(WikibaseTestCase): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/664582 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: I6b160d12071e0d3c86d680dadd069fd3489eb362 Gerrit-Change-Number: 664582 Gerrit-PatchSet: 1 Gerrit-Owner: Homeboy 445 <akshitsan13(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 2 months

[Gerrit] ...core[master]: Change Import Preference for unittest module

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/664312 ) Change subject: Change Import Preference for unittest module ...................................................................... Change Import Preference for unittest module Bug: T272235 Change-Id: If0587ce6162ead28ddc152ab56711d0f10f220df --- M tests/category_bot_tests.py M tests/file_tests.py M tests/generate_family_file_tests.py M tests/generate_user_files_tests.py M tests/interwiki_graph_tests.py M tests/interwikidata_tests.py M tests/l10n_tests.py M tests/logentries_tests.py M tests/mediawikiversion_tests.py M tests/plural_tests.py M tests/proofreadpage_tests.py M tests/protectbot_tests.py M tests/pwb_tests.py M tests/timestamp_tests.py M tests/titletranslate_tests.py M tests/tk_tests.py M tests/tools_chars_tests.py M tests/tools_formatter_tests.py M tests/tools_ip_tests.py M tests/tools_tests.py M tests/ui_options_tests.py M tests/upload_tests.py M tests/uploadbot_tests.py M tests/uploadscript_tests.py M tests/weblinkchecker_tests.py M tests/wikistats_tests.py M tests/xmlreader_tests.py 27 files changed, 84 insertions(+), 43 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/category_bot_tests.py b/tests/category_bot_tests.py index cd31ce9..25ff3db 100644 --- a/tests/category_bot_tests.py +++ b/tests/category_bot_tests.py @@ -1,9 +1,11 @@ """Tests for the category bot script.""" # -# (C) Pywikibot team, 2015-2020 +# (C) Pywikibot team, 2015-2021 # # Distributed under the terms of the MIT license. # +import unittest + from contextlib import suppress import pywikibot @@ -12,7 +14,7 @@ from scripts.category import CategoryPreprocess, CategoryMoveRobot from tests import patch, Mock -from tests.aspects import unittest, DefaultSiteTestCase, TestCase +from tests.aspects import DefaultSiteTestCase, TestCase MOCKED_USERNAME = Mock(return_value='FakeUsername') diff --git a/tests/file_tests.py b/tests/file_tests.py index af39bff..2834822 100644 --- a/tests/file_tests.py +++ b/tests/file_tests.py @@ -1,11 +1,12 @@ """FilePage tests.""" # -# (C) Pywikibot team, 2014-2020 +# (C) Pywikibot team, 2014-2021 # # Distributed under the terms of the MIT license. # import os import re +import unittest from contextlib import suppress @@ -13,7 +14,7 @@ from tests import join_images_path -from tests.aspects import unittest, TestCase +from tests.aspects import TestCase class TestShareFiles(TestCase): diff --git a/tests/generate_family_file_tests.py b/tests/generate_family_file_tests.py index 159b85d..75f016f 100644 --- a/tests/generate_family_file_tests.py +++ b/tests/generate_family_file_tests.py @@ -1,16 +1,18 @@ """Test generate_family_file script.""" # -# (C) Pywikibot team, 2018-2020 +# (C) Pywikibot team, 2018-2021 # # Distributed under the terms of the MIT license. # +import unittest + from contextlib import suppress from random import sample from urllib.parse import urlparse from pywikibot import Site -from tests.aspects import unittest, DefaultSiteTestCase +from tests.aspects import DefaultSiteTestCase import generate_family_file diff --git a/tests/generate_user_files_tests.py b/tests/generate_user_files_tests.py index 7970358..5ecd786 100644 --- a/tests/generate_user_files_tests.py +++ b/tests/generate_user_files_tests.py @@ -1,12 +1,13 @@ """Test generate_user_files script.""" # -# (C) Pywikibot team, 2018-2020 +# (C) Pywikibot team, 2018-2021 # # Distributed under the terms of the MIT license. # import re +import unittest -from tests.aspects import unittest, TestCase +from tests.aspects import TestCase import generate_user_files as guf diff --git a/tests/interwiki_graph_tests.py b/tests/interwiki_graph_tests.py index 20af65d..765a360 100644 --- a/tests/interwiki_graph_tests.py +++ b/tests/interwiki_graph_tests.py @@ -1,15 +1,17 @@ #!/usr/bin/python """Test Interwiki Graph functionality.""" # -# (C) Pywikibot team, 2015-2020 +# (C) Pywikibot team, 2015-2021 # # Distributed under the terms of the MIT license. # +import unittest + from contextlib import suppress from pywikibot import interwiki_graph -from tests.aspects import unittest, require_modules, SiteAttributeTestCase +from tests.aspects import require_modules, SiteAttributeTestCase from tests.utils import DryPage diff --git a/tests/interwikidata_tests.py b/tests/interwikidata_tests.py index ea7de14..be19cbd 100644 --- a/tests/interwikidata_tests.py +++ b/tests/interwikidata_tests.py @@ -4,6 +4,8 @@ # # Distributed under the terms of the MIT license. # +import unittest + from contextlib import suppress import pywikibot @@ -12,7 +14,7 @@ from scripts import interwikidata -from tests.aspects import unittest, SiteAttributeTestCase +from tests.aspects import SiteAttributeTestCase from tests.utils import empty_sites diff --git a/tests/l10n_tests.py b/tests/l10n_tests.py index dce9fcf..5557512 100644 --- a/tests/l10n_tests.py +++ b/tests/l10n_tests.py @@ -1,10 +1,11 @@ """Test valid templates.""" # -# (C) Pywikibot team, 2015-2020 +# (C) Pywikibot team, 2015-2021 # # Distributed under the terms of the MIT license. # import os +import unittest from contextlib import suppress @@ -12,7 +13,7 @@ from pywikibot import i18n from pywikibot.textlib import extract_templates_and_params_regex_simple -from tests.aspects import unittest, MetaTestCaseClass, TestCase +from tests.aspects import MetaTestCaseClass, TestCase PACKAGES = ( 'redirect-broken-redirect-template', # speedy deletion template diff --git a/tests/logentries_tests.py b/tests/logentries_tests.py index 42ad908..5336497 100644 --- a/tests/logentries_tests.py +++ b/tests/logentries_tests.py @@ -5,6 +5,7 @@ # Distributed under the terms of the MIT license. # import datetime +import unittest from contextlib import suppress @@ -17,7 +18,7 @@ from tests import unittest_print from tests.aspects import ( - unittest, MetaTestCaseClass, TestCase, DeprecationTestCase + MetaTestCaseClass, TestCase, DeprecationTestCase ) diff --git a/tests/mediawikiversion_tests.py b/tests/mediawikiversion_tests.py index 6803dfc..1bc0866 100644 --- a/tests/mediawikiversion_tests.py +++ b/tests/mediawikiversion_tests.py @@ -4,11 +4,13 @@ # # Distributed under the terms of the MIT license. # +import unittest + from contextlib import suppress from pywikibot.tools import MediaWikiVersion -from tests.aspects import unittest, TestCase +from tests.aspects import TestCase class TestMediaWikiVersion(TestCase): diff --git a/tests/plural_tests.py b/tests/plural_tests.py index 052a919..5bc8a01 100644 --- a/tests/plural_tests.py +++ b/tests/plural_tests.py @@ -1,14 +1,16 @@ """Test plural module.""" # -# (C) Pywikibot team, 2015-2020 +# (C) Pywikibot team, 2015-2021 # # Distributed under the terms of the MIT license. # +import unittest + from contextlib import suppress from pywikibot import plural -from tests.aspects import unittest, TestCase, MetaTestCaseClass +from tests.aspects import TestCase, MetaTestCaseClass class MetaPluralRulesTest(MetaTestCaseClass): diff --git a/tests/proofreadpage_tests.py b/tests/proofreadpage_tests.py index 78e38d3..5823e47 100644 --- a/tests/proofreadpage_tests.py +++ b/tests/proofreadpage_tests.py @@ -6,6 +6,7 @@ # import difflib import json +import unittest from contextlib import suppress @@ -16,7 +17,7 @@ from pywikibot.tools import has_module from tests import unittest_print -from tests.aspects import unittest, require_modules, TestCase +from tests.aspects import require_modules, TestCase from tests.basepage import ( BasePageMethodsTestBase, BasePageLoadRevisionsCachingTestBase, diff --git a/tests/protectbot_tests.py b/tests/protectbot_tests.py index 49b5b3d..8122881 100644 --- a/tests/protectbot_tests.py +++ b/tests/protectbot_tests.py @@ -1,9 +1,11 @@ """Tests for scripts/protect.py.""" # -# (C) Pywikibot team, 2014-2020 +# (C) Pywikibot team, 2014-2021 # # Distributed under the terms of the MIT license. # +import unittest + from contextlib import suppress import pywikibot @@ -11,7 +13,7 @@ from scripts import protect -from tests.aspects import unittest, ScriptMainTestCase +from tests.aspects import ScriptMainTestCase class TestProtectionBot(ScriptMainTestCase): diff --git a/tests/pwb_tests.py b/tests/pwb_tests.py index 89ccc1b..011d6d7 100644 --- a/tests/pwb_tests.py +++ b/tests/pwb_tests.py @@ -6,12 +6,13 @@ https://bitbucket.org/ned/coveragepy/src/default/tests/test_execfile.py """ # -# (C) Pywikibot team, 2007-2020 +# (C) Pywikibot team, 2007-2021 # # Distributed under the terms of the MIT license. # import io import sys +import unittest from tests import join_tests_path, create_path_func from tests.utils import execute, execute_pwb diff --git a/tests/timestamp_tests.py b/tests/timestamp_tests.py index 613e8ed..790a58e 100644 --- a/tests/timestamp_tests.py +++ b/tests/timestamp_tests.py @@ -1,18 +1,19 @@ """Tests for the Timestamp class.""" # -# (C) Pywikibot team, 2014-2020 +# (C) Pywikibot team, 2014-2021 # # Distributed under the terms of the MIT license. # import calendar import datetime import re +import unittest from contextlib import suppress from pywikibot import Timestamp -from tests.aspects import unittest, TestCase +from tests.aspects import TestCase class TestTimestamp(TestCase): diff --git a/tests/titletranslate_tests.py b/tests/titletranslate_tests.py index 6244365..361130f 100644 --- a/tests/titletranslate_tests.py +++ b/tests/titletranslate_tests.py @@ -4,9 +4,11 @@ # # Distributed under the terms of the MIT license. # +import unittest + from pywikibot.titletranslate import translate -from tests.aspects import unittest, TestCase +from tests.aspects import TestCase class TestTitleTranslate(TestCase): diff --git a/tests/tk_tests.py b/tests/tk_tests.py index e2444e3..eb3b13d 100644 --- a/tests/tk_tests.py +++ b/tests/tk_tests.py @@ -1,15 +1,16 @@ """Tests for the Tk UI.""" # -# (C) Pywikibot team, 2008-2020 +# (C) Pywikibot team, 2008-2021 # # Distributed under the terms of the MIT license. # import os +import unittest from contextlib import suppress import pywikibot -from tests.aspects import unittest, TestCase, DefaultSiteTestCase +from tests.aspects import TestCase, DefaultSiteTestCase if os.environ.get('PYWIKIBOT_TEST_GUI', '0') == '1': diff --git a/tests/tools_chars_tests.py b/tests/tools_chars_tests.py index f472a46..719292d 100644 --- a/tests/tools_chars_tests.py +++ b/tests/tools_chars_tests.py @@ -1,16 +1,17 @@ #!/usr/bin/python """Test tools.chars package.""" # -# (C) Pywikibot team, 2015-2020 +# (C) Pywikibot team, 2015-2021 # # Distributed under the terms of the MIT license. import unicodedata +import unittest from contextlib import suppress from pywikibot.tools import chars -from tests.aspects import unittest, TestCase +from tests.aspects import TestCase class CharsTestCase(TestCase): diff --git a/tests/tools_formatter_tests.py b/tests/tools_formatter_tests.py index c4e92f7..c97f03d 100644 --- a/tests/tools_formatter_tests.py +++ b/tests/tools_formatter_tests.py @@ -4,11 +4,13 @@ # # Distributed under the terms of the MIT license. # +import unittest + from contextlib import suppress from pywikibot.tools import formatter -from tests.aspects import unittest, TestCase +from tests.aspects import TestCase class TestListOutputter(TestCase): diff --git a/tests/tools_ip_tests.py b/tests/tools_ip_tests.py index 5cef108..b3ba311 100644 --- a/tests/tools_ip_tests.py +++ b/tests/tools_ip_tests.py @@ -1,15 +1,17 @@ #!/usr/bin/python """Test IP module/regex.""" # -# (C) Pywikibot team, 2012-2020 +# (C) Pywikibot team, 2012-2021 # # Distributed under the terms of the MIT license. +import unittest + from contextlib import suppress from pywikibot.tools import is_IP, PYTHON_VERSION from tests import unittest_print -from tests.aspects import unittest, TestCase +from tests.aspects import TestCase from tests.utils import expected_failure_if diff --git a/tests/tools_tests.py b/tests/tools_tests.py index 384332a..d6a6f6e 100644 --- a/tests/tools_tests.py +++ b/tests/tools_tests.py @@ -8,6 +8,7 @@ import os.path import subprocess import tempfile +import unittest from collections.abc import Mapping from collections import OrderedDict @@ -18,7 +19,7 @@ from pywikibot.tools import classproperty from tests import join_xml_data_path, mock -from tests.aspects import unittest, require_modules, TestCase +from tests.aspects import require_modules, TestCase class OpenArchiveTestCase(TestCase): diff --git a/tests/ui_options_tests.py b/tests/ui_options_tests.py index 478f31b..d3a1f3c 100644 --- a/tests/ui_options_tests.py +++ b/tests/ui_options_tests.py @@ -4,11 +4,13 @@ # # Distributed under the terms of the MIT license. # +import unittest + from contextlib import suppress from pywikibot import bot, bot_choice -from tests.aspects import unittest, TestCase +from tests.aspects import TestCase message = bot.Option.formatted diff --git a/tests/upload_tests.py b/tests/upload_tests.py index 91c1820..eaca6d1 100644 --- a/tests/upload_tests.py +++ b/tests/upload_tests.py @@ -4,16 +4,18 @@ These tests write to the wiki. """ # -# (C) Pywikibot team, 2014-2020 +# (C) Pywikibot team, 2014-2021 # # Distributed under the terms of the MIT license. # +import unittest + from contextlib import suppress import pywikibot from tests import join_images_path -from tests.aspects import unittest, TestCase +from tests.aspects import TestCase class TestUpload(TestCase): diff --git a/tests/uploadbot_tests.py b/tests/uploadbot_tests.py index ce43964..2257855 100644 --- a/tests/uploadbot_tests.py +++ b/tests/uploadbot_tests.py @@ -4,18 +4,19 @@ These tests write to the wiki. """ # -# (C) Pywikibot team, 2014-2020 +# (C) Pywikibot team, 2014-2021 # # Distributed under the terms of the MIT license. # import os +import unittest from contextlib import suppress from pywikibot.specialbots import UploadRobot from tests import join_images_path -from tests.aspects import unittest, TestCase, DefaultSiteTestCase +from tests.aspects import TestCase, DefaultSiteTestCase class TestUploadbot(TestCase): diff --git a/tests/uploadscript_tests.py b/tests/uploadscript_tests.py index 140b94e..453b7ee 100644 --- a/tests/uploadscript_tests.py +++ b/tests/uploadscript_tests.py @@ -1,14 +1,16 @@ """upload.py script test.""" # -# (C) Pywikibot team, 2019-2020 +# (C) Pywikibot team, 2019-2021 # # Distributed under the terms of the MIT license. # +import unittest + from contextlib import suppress from scripts.upload import CHUNK_SIZE_REGEX, get_chunk_size -from tests.aspects import unittest, TestCase +from tests.aspects import TestCase class TestUploadScript(TestCase): diff --git a/tests/weblinkchecker_tests.py b/tests/weblinkchecker_tests.py index 57782c2..6acd51a 100644 --- a/tests/weblinkchecker_tests.py +++ b/tests/weblinkchecker_tests.py @@ -5,13 +5,14 @@ # Distributed under the terms of the MIT license. # import datetime +import unittest from contextlib import suppress from requests.exceptions import ConnectionError as RequestsConnectionError from urllib.parse import urlparse from scripts import weblinkchecker -from tests.aspects import unittest, require_modules, TestCase +from tests.aspects import require_modules, TestCase @require_modules('memento_client') diff --git a/tests/wikistats_tests.py b/tests/wikistats_tests.py index 5883ed8..f166f1d 100644 --- a/tests/wikistats_tests.py +++ b/tests/wikistats_tests.py @@ -5,12 +5,13 @@ # Distributed under the terms of the MIT license. # import sys +import unittest from contextlib import suppress from pywikibot.data.wikistats import WikiStats -from tests.aspects import unittest, TestCase +from tests.aspects import TestCase class WikiStatsTestCase(TestCase): diff --git a/tests/xmlreader_tests.py b/tests/xmlreader_tests.py index c0c92a8..fcd775b 100644 --- a/tests/xmlreader_tests.py +++ b/tests/xmlreader_tests.py @@ -1,15 +1,17 @@ """Tests for xmlreader module.""" # -# (C) Pywikibot team, 2009-2020 +# (C) Pywikibot team, 2009-2021 # # Distributed under the terms of the MIT license. # +import unittest + from contextlib import suppress from pywikibot import xmlreader from tests import join_xml_data_path -from tests.aspects import unittest, TestCase +from tests.aspects import TestCase class XmlReaderTestCase(TestCase): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/664312 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: If0587ce6162ead28ddc152ab56711d0f10f220df Gerrit-Change-Number: 664312 Gerrit-PatchSet: 1 Gerrit-Owner: Homeboy 445 <akshitsan13(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 2 months

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/664284 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I90fc975142f66863fa1dc36175d4b8e3c67da16f --- M solve_disambiguation/eu.json M unusedfiles/eu.json M weblinkchecker/eu.json 3 files changed, 8 insertions(+), 6 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/solve_disambiguation/eu.json b/solve_disambiguation/eu.json index 8ecea0d..ce442c2 100644 --- a/solve_disambiguation/eu.json +++ b/solve_disambiguation/eu.json @@ -2,13 +2,14 @@ "@metadata": { "authors": [ "An13sa", - "EukeneFL" + "EukeneFL", + "Xabier Armendaritz" ] }, - "solve_disambiguation-adding-dn-template": "Bot-lagundutako desambiguazioa: %(from)s - Adituen arreta behar bezala markatuta", + "solve_disambiguation-adding-dn-template": "Botez lagundutako desanbiguazioa: %(from)s - Adituen arreta behar duela markatuta", "solve_disambiguation-links-removed": "Bot-lagundutako desambiguazioa: %(from)s - Link(ak) ezabatua(k)", "solve_disambiguation-links-resolved": "Bot-lagundutako desambiguazioa: %(from)s - Linka(k) %(to)s-tara aldatuta", - "solve_disambiguation-redirect-adding-dn-template": "Bot-lagundutako desambiguazioa: %(from)s - Adituen arreta behar bezala markatuta", + "solve_disambiguation-redirect-adding-dn-template": "Botez lagundutako desanbiguazioa: %(from)s - Adituen arreta behar duela markatuta", "solve_disambiguation-redirect-removed": "Bot-lagundutako desambiguazioa: %(from)s - Linka(k) ezabatua(k)", "solve_disambiguation-redirect-resolved": "Bot-lagundutako desambiguazioa: %(from)s - Linka(k) %(to)s-tara aldatuta", "solve_disambiguation-unknown-page": "(ezezaguna)" diff --git a/unusedfiles/eu.json b/unusedfiles/eu.json index 391ffca..f0b0964 100644 --- a/unusedfiles/eu.json +++ b/unusedfiles/eu.json @@ -2,8 +2,9 @@ "@metadata": { "authors": [ "An13sa", - "Subi" + "Subi", + "Xabier Armendaritz" ] }, - "unusedfiles-comment": "Bot: fitxategia umezurtz bezala sailkatzen da" + "unusedfiles-comment": "Bot: fitxategia umezurtz gisa sailkatzen" } diff --git a/weblinkchecker/eu.json b/weblinkchecker/eu.json index 39245bc..4256853 100644 --- a/weblinkchecker/eu.json +++ b/weblinkchecker/eu.json @@ -6,7 +6,7 @@ "Xabier Armendaritz" ] }, - "weblinkchecker-archive_msg": "Webgunea Internet Archive-k gorde du. Kontutan hartu artxibatutako bertsio egokiarekin lotura:[%(URL)s].", + "weblinkchecker-archive_msg": "Web orria Internet Archivek gorde du. Kontuan har ezazu ea ez ote den komeni bertsio artxibatu egoki bateranzko esteka ezartzea: [%(URL)s].", "weblinkchecker-badurl": "Emandako linkak ez du ematen baliozko URLa denik", "weblinkchecker-caption": "Esteka hautsia", "weblinkchecker-report": "Bot automatizatu askotan zehar hurrengo kanpoko estekak erabilgarri ez zeudela ikusi da. Mesedez, egiaztatu lotura hori benetan behekoa dela eta konpon ezazu, edo bestetik kendu ezazu!", -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/664284 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Change-Id: I90fc975142f66863fa1dc36175d4b8e3c67da16f Gerrit-Change-Number: 664284 Gerrit-PatchSet: 1 Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 2 months

[Gerrit] ...core[master]: [cleanup] Drop startsort/endsort parameter for site.categorymembers m...

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662081 ) Change subject: [cleanup] Drop startsort/endsort parameter for site.categorymembers method ...................................................................... [cleanup] Drop startsort/endsort parameter for site.categorymembers method - startsort/endsort parameter is deprecated since MW 1.24 and their usage is confusing. startsort/endsort were replaced by starthexsortkey/endhexsortkey which are required as hexlified byte strings but they aren't supported by Pywikibot. Since MW 1.23 is the only supported MW version which has startsort/endsort parameters for categorymembers, I guess we can drop that support of startsort/endsort parameter now. The human readable corresponding parameters are startprefix/endprefix which is supported already. - update the corresponding Page.articles() method accordingly Bug: T74101 Change-Id: I6fa0bd11a68dad3ff0ac6a1c0136b6bad68eacd3 --- M pywikibot/page/__init__.py M pywikibot/site/_apisite.py 2 files changed, 46 insertions(+), 70 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index 4cd0970..c4fbe38 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -2594,7 +2594,7 @@ if total == 0: return - @deprecated_args(startFrom='startprefix') + @deprecated_args(startFrom='startprefix', startsort=None, endsort=None) def articles(self, recurse: Union[int, bool] = False, total: Optional[int] = None, @@ -2603,11 +2603,8 @@ sortby: Optional[str] = None, reverse: bool = False, starttime=None, endtime=None, - startsort: Optional[str] = None, - endsort: Optional[str] = None, startprefix: Optional[str] = None, - endprefix: Optional[str] = None, - ): + endprefix: Optional[str] = None): """ Yield all articles in the current category. @@ -2635,32 +2632,24 @@ @param endtime: if provided, only generate pages added before this time; not valid unless sortby="timestamp" @type endtime: pywikibot.Timestamp - @param startsort: if provided, only generate pages that have a - sortkey >= startsort; not valid if sortby="timestamp" - (Deprecated in MW 1.24) - @param endsort: if provided, only generate pages that have a - sortkey <= endsort; not valid if sortby="timestamp" - (Deprecated in MW 1.24) @param startprefix: if provided, only generate pages >= this title - lexically; not valid if sortby="timestamp"; overrides "startsort" + lexically; not valid if sortby="timestamp" @param endprefix: if provided, only generate pages < this title - lexically; not valid if sortby="timestamp"; overrides "endsort" + lexically; not valid if sortby="timestamp" @rtype: typing.Iterable[pywikibot.Page] """ seen = set() for member in self.site.categorymembers(self, namespaces=namespaces, total=total, - content=content, sortby=sortby, + content=content, + sortby=sortby, reverse=reverse, starttime=starttime, endtime=endtime, - startsort=startsort, - endsort=endsort, startprefix=startprefix, endprefix=endprefix, - member_type=['page', 'file'] - ): + member_type=['page', 'file']): if recurse: seen.add(hash(member)) yield member @@ -2668,22 +2657,21 @@ total -= 1 if total == 0: return + if recurse: if not isinstance(recurse, bool) and recurse: - recurse = recurse - 1 + recurse -= 1 for subcat in self.subcategories(): - for article in subcat.articles(recurse, total=total, + for article in subcat.articles(recurse=recurse, + total=total, content=content, namespaces=namespaces, sortby=sortby, reverse=reverse, starttime=starttime, endtime=endtime, - startsort=startsort, - endsort=endsort, startprefix=startprefix, - endprefix=endprefix, - ): + endprefix=endprefix): hash_value = hash(article) if hash_value in seen: continue diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index 8e142c2..a821623 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -1888,12 +1888,18 @@ titles=tltitle, namespaces=namespaces, total=total, g_content=content) - @deprecated_args(step=None) - def categorymembers(self, category, *, namespaces=None, sortby=None, - reverse=False, starttime=None, endtime=None, - startsort=None, endsort=None, total=None, - content=False, member_type=None, - startprefix=None, endprefix=None): + @deprecated_args(step=None, startsort=None, endsort=None) + def categorymembers(self, category, *, + namespaces=None, + sortby: Optional[str] = None, + reverse: bool = False, + starttime=None, + endtime=None, + total: Optional[int] = None, + content: bool = False, + member_type=None, + startprefix: Optional[str] = None, + endprefix: Optional[str] = None): """Iterate members of specified category. @see: U{https://www.mediawiki.org/wiki/API:Categorymembers} @@ -1909,7 +1915,6 @@ valid values are "sortkey" (default, results ordered by category sort key) or "timestamp" (results ordered by time page was added to the category) - @type sortby: str @param reverse: if True, generate results in reverse order (default False) @param starttime: if provided, only generate pages added after this @@ -1917,23 +1922,12 @@ @type starttime: pywikibot.Timestamp @param endtime: if provided, only generate pages added before this time; not valid unless sortby="timestamp" - @param startsort: if provided, only generate pages that have a - sortkey >= startsort; not valid if sortby="timestamp" - (Deprecated in MW 1.24) - @type startsort: str - @param endsort: if provided, only generate pages that have a - sortkey <= endsort; not valid if sortby="timestamp" - (Deprecated in MW 1.24) - @type endsort: str @param startprefix: if provided, only generate pages >= this title - lexically; not valid if sortby="timestamp"; overrides "startsort" - @type startprefix: str + lexically; not valid if sortby="timestamp" @param endprefix: if provided, only generate pages < this title - lexically; not valid if sortby="timestamp"; overrides "endsort" - @type endprefix: str + lexically; not valid if sortby="timestamp" @param content: if True, load the current content of each iterated page (default False) - @type content: bool @param member_type: member type; if member_type includes 'page' and is used in conjunction with sortby="timestamp", the API may limit results to only pages in the first 50 namespaces. @@ -1945,27 +1939,28 @@ type such as NoneType or bool """ if category.namespace() != 14: - raise Error( - "categorymembers: non-Category page '%s' specified" - % category.title()) + raise Error('categorymembers: non-Category page {!r} specified' + .format(category)) + cmtitle = category.title(with_section=False).encode(self.encoding()) - cmargs = {'type_arg': 'categorymembers', 'gcmtitle': cmtitle, - 'gcmprop': 'ids|title|sortkey'} + cmargs = { + 'type_arg': 'categorymembers', + 'gcmtitle': cmtitle, + 'gcmprop': 'ids|title|sortkey' + } + if sortby in ['sortkey', 'timestamp']: cmargs['gcmsort'] = sortby elif sortby: - raise ValueError( - "categorymembers: invalid sortby value '%s'" - % sortby) + raise ValueError('categorymembers: invalid sortby value {!r}' + .format(sortby)) + if starttime and endtime and starttime > endtime: raise ValueError( 'categorymembers: starttime must be before endtime') if startprefix and endprefix and startprefix > endprefix: raise ValueError( 'categorymembers: startprefix must be less than endprefix') - elif startsort and endsort and startsort > endsort: - raise ValueError( - 'categorymembers: startsort must be less than endsort') if isinstance(member_type, str): member_type = {member_type} @@ -1984,8 +1979,8 @@ if namespaces: if excluded_namespaces.intersection(namespaces): raise ValueError( - 'incompatible namespaces %r and member_type %r' - % (namespaces, member_type)) + 'incompatible namespaces {!r} and member_type {!r}' + .format(namespaces, member_type)) # All excluded namespaces are not present in `namespaces`. else: # If the number of namespaces is greater than permitted by @@ -2011,39 +2006,32 @@ cmargs['gcmdir'] = 'desc' # API wants start/end params in opposite order if using descending # sort; we take care of this reversal for the user - (starttime, endtime) = (endtime, starttime) - (startsort, endsort) = (endsort, startsort) - (startprefix, endprefix) = (endprefix, startprefix) + starttime, endtime = endtime, starttime + startprefix, endprefix = endprefix, startprefix + if starttime and sortby == 'timestamp': cmargs['gcmstart'] = starttime elif starttime: raise ValueError('categorymembers: ' "invalid combination of 'sortby' and 'starttime'") + if endtime and sortby == 'timestamp': cmargs['gcmend'] = endtime elif endtime: raise ValueError('categorymembers: ' "invalid combination of 'sortby' and 'endtime'") + if startprefix and sortby != 'timestamp': cmargs['gcmstartsortkeyprefix'] = startprefix elif startprefix: raise ValueError('categorymembers: invalid combination of ' "'sortby' and 'startprefix'") - elif startsort and sortby != 'timestamp': - cmargs['gcmstartsortkey'] = startsort - elif startsort: - raise ValueError('categorymembers: ' - "invalid combination of 'sortby' and 'startsort'") + if endprefix and sortby != 'timestamp': cmargs['gcmendsortkeyprefix'] = endprefix elif endprefix: raise ValueError('categorymembers: ' "invalid combination of 'sortby' and 'endprefix'") - elif endsort and sortby != 'timestamp': - cmargs['gcmendsortkey'] = endsort - elif endsort: - raise ValueError('categorymembers: ' - "invalid combination of 'sortby' and 'endsort'") return self._generator(api.PageGenerator, namespaces=namespaces, total=total, g_content=content, **cmargs) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/662081 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: I6fa0bd11a68dad3ff0ac6a1c0136b6bad68eacd3 Gerrit-Change-Number: 662081 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, 2 months

[Gerrit] ...core[master]: [cleanup] remove deprecated DisambiguationRobot methods

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/664058 ) Change subject: [cleanup] remove deprecated DisambiguationRobot methods ...................................................................... [cleanup] remove deprecated DisambiguationRobot methods Deprecation is announces as FutureWarning since 5.2.0 Change-Id: I3322d300da198f0d41bc30d75f9a9b591da7e421 --- M scripts/solve_disambiguation.py 1 file changed, 0 insertions(+), 30 deletions(-) Approvals: Matěj Suchánek: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index 9a5559a..7091084 100755 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -620,36 +620,6 @@ self.dn_template_str = i18n.translate(self.site, dn_template) - @property - @deprecated('site attribute', since='20201102', future_warning=True) - def mysite(self): - """DEPRECATED mysite attribute.""" - return self.site - - @mysite.setter - @deprecated('site attribute', since='20201102', future_warning=True) - def mysite(self, value): - """DEPRECATED mysite attribute.""" - self.site = value - - @property - @deprecated('site.lang attribute', since='20201102', future_warning=True) - def mylang(self): - """DEPRECATED mylang attribute.""" - return self.site.lang - - @property - @deprecated('summary attribute', since='20201102', future_warning=True) - def comment(self): - """DEPRECATED edit summary property.""" - return self.summary - - @comment.setter - @deprecated('summary attribute', since='20201102', future_warning=True) - def comment(self, value): - """DEPRECATED edit summary property setter.""" - self.summary = value - def checkContents(self, text) -> Optional[str]: """ Check if the text matches any of the ignore regexes. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/664058 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: I3322d300da198f0d41bc30d75f9a9b591da7e421 Gerrit-Change-Number: 664058 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: DannyS712 <DannyS712.enwiki(a)gmail.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 2 months

[Gerrit] ...core[master]: [tests] Update sphinx config file to example script from 26th June 2016

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/664054 ) Change subject: [tests] Update sphinx config file to example script from 26th June 2016 ...................................................................... [tests] Update sphinx config file to example script from 26th June 2016 Change-Id: I10b39a6f1d3a7a161a9d62c2350c8ae935293d2a --- M docs/conf.py 1 file changed, 160 insertions(+), 68 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/conf.py b/docs/conf.py index 99c01f7..210d8d0 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,27 +1,31 @@ """Configuration file for Sphinx.""" # -# (C) Pywikibot team, 2014-2020 +# (C) Pywikibot team, 2014-2021 # # Distributed under the terms of the MIT license. # # Pywikibot documentation build configuration file, created by -# sphinx-quickstart on Wed Nov 5 15:50:05 2014. +# sphinx-quickstart on Sun Jun 26 00:00:43 2016. # -# This file is execfile()d with the current dir set to its containing dir. +# This file is execfile()d with the current directory set to its +# containing dir. # # Note that not all possible configuration values are present in this # autogenerated file. # # All configuration values have a default; values that are commented out # serve to show the default. -import os -from os.path import abspath, dirname, join -import re -import sys # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the # documentation root, use os.path.abspath to make it absolute, like shown here. +# +import os +import re +import sys + +from os.path import abspath, dirname, join + docs_dir = dirname(__file__) repo_dir = abspath(join(docs_dir, '..')) sys.path.insert(0, repo_dir) @@ -30,13 +34,15 @@ os.environ['PYWIKIBOT_NO_USER_CONFIG'] = '1' import pywikibot # noqa: E402 -# -- General configuration ---------------------------------------------------- +# -- General configuration ------------------------------------------------ # If your documentation needs a minimal Sphinx version, state it here. -# needs_sphinx = '1.0' +# +# needs_sphinx = '1.0' # Add any Sphinx extension module names here, as strings. They can be -# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones. +# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom +# ones. extensions = ['sphinx.ext.autodoc', 'sphinx_epytext', 'sphinx.ext.todo', @@ -51,147 +57,225 @@ # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] -# The suffix of source filenames. +# The suffix(es) of source filenames. +# You can specify multiple suffix as a list of string: +# +# source_suffix = ['.rst', '.md'] source_suffix = '.rst' # The encoding of source files. -# source_encoding = 'utf-8-sig' +# +# source_encoding = 'utf-8-sig' # The master toctree document. master_doc = 'index' # General information about the project. project = pywikibot.__name__.title() -copyright = pywikibot.__copyright__ +project_copyright = pywikibot.__copyright__ # alias since Python 3.5 +# author = 'test' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. -version = release = pywikibot.__version__ +# +# The short X.Y version. +version = pywikibot.__version__ +# The full version, including alpha/beta/rc tags. +release = pywikibot.__version__ # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. -# language = None +# +# This is also used if you do content translation via gettext catalogs. +# Usually you set "language" from the command line for these cases. +# language = None # There are two options for replacing |today|: either, you set today to some # non-false value, then it is used: -# today = '' +# +# today = '' +# # Else, today_fmt is used as the format for a strftime call. -# today_fmt = '%B %d, %Y' +# +# today_fmt = '%B %d, %Y' # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. +# These patterns also affect html_static_path and html_extra_path exclude_patterns = ['_build'] # The reST default role (used for this markup: `text`) to use for all # documents. +# default_role = 'code' # If true, '()' will be appended to :func: etc. cross-reference text. -# add_function_parentheses = True +# +# add_function_parentheses = True # If true, the current module name will be prepended to all description # unit titles (such as .. function::). -# add_module_names = True +# +# add_module_names = True # If true, sectionauthor and moduleauthor directives will be shown in the # output. They are ignored by default. -# show_authors = False +# +# show_authors = False # The name of the Pygments (syntax highlighting) style to use. pygments_style = 'sphinx' # A list of ignored prefixes for module index sorting. -# modindex_common_prefix = [] +# modindex_common_prefix = [] + +# If true, keep warnings as "system message" paragraphs in the built documents. +# keep_warnings = False + +# If true, `todo` and `todoList` produce output, else they produce nothing. +# todo_include_todos = False -# -- Options for HTML output -------------------------------------------------- +# -- Options for HTML output ---------------------------------------------- # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. +# html_theme = 'alabaster' # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the # documentation. -# html_theme_options = {} +# +# html_theme_options = {} # Add any paths that contain custom themes here, relative to this directory. -# html_theme_path = [] +# html_theme_path = [] -# The name for this set of Sphinx documents. If None, it defaults to -# "<project> v<release> documentation". -# html_title = None +# The name for this set of Sphinx documents. +# "<project> v<release> documentation" by default. +# +# html_title = 'test vtest' # A shorter title for the navigation bar. Default is the same as html_title. -# html_short_title = None +# +# html_short_title = None # The name of an image file (relative to this directory) to place at the top # of the sidebar. -# html_logo = None +# +# html_logo = None -# The name of an image file (within the static path) to use as favicon of the -# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 +# The name of an image file (relative to this directory) to use as a favicon of +# the docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 # pixels large. -# html_favicon = None +# +# html_favicon = None # Add any paths that contain custom static files (such as style sheets) here, # relative to this directory. They are copied after the builtin static files, # so a file named "default.css" will overwrite the builtin "default.css". -# html_static_path = ['_static'] +# html_static_path = ['_static'] -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -# html_last_updated_fmt = '%b %d, %Y' +# Add any extra paths that contain custom files (such as robots.txt or +# .htaccess) here, relative to this directory. These files are copied +# directly to the root of the documentation. +# +# html_extra_path = [] -# If true, SmartyPants will be used to convert quotes and dashes to -# typographically correct entities. -# html_use_smartypants = True +# If not None, a 'Last updated on:' timestamp is inserted at every page +# bottom, using the given strftime format. +# The empty string is equivalent to '%b %d, %Y'. +# +# html_last_updated_fmt = None # Custom sidebar templates, maps document names to template names. -# html_sidebars = {} +# +# html_sidebars = {} # Additional templates that should be rendered to pages, maps page names to # template names. -# html_additional_pages = {} +# +# html_additional_pages = {} # If false, no module index is generated. -# html_domain_indices = True +# +# html_domain_indices = True # If false, no index is generated. -# html_use_index = True +# +# html_use_index = True # If true, the index is split into individual pages for each letter. -# html_split_index = False +# +# html_split_index = False # If true, links to the reST sources are added to the pages. -# html_show_sourcelink = True +# +# html_show_sourcelink = True # If true, "Created using Sphinx" is shown in the HTML footer. Default is True. -# html_show_sphinx = True +# +# html_show_sphinx = True # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -# html_show_copyright = True +# +# html_show_copyright = True # If true, an OpenSearch description file will be output, and all pages will # contain a <link> tag referring to it. The value of this option must be the # base URL from which the finished HTML is served. -# html_use_opensearch = '' +# +# html_use_opensearch = '' # This is the file name suffix for HTML files (e.g. ".xhtml"). -# html_file_suffix = None +# html_file_suffix = None + +# Language to be used for generating the HTML full-text search index. +# Sphinx supports the following languages: +# 'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja' +# 'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr', 'zh' +# +# html_search_language = 'en' + +# A dictionary with options for the search language support, empty by default. +# 'ja' uses this config value. +# 'zh' user can custom change `jieba` dictionary path. +# +# html_search_options = {'type': 'default'} + +# The name of a javascript file (relative to the configuration directory) that +# implements a search results scorer. If empty, the default will be used. +# +# html_search_scorer = 'scorer.js' # Output file base name for HTML help builder. htmlhelp_basename = 'Pywikibotdoc' +# -- Options for LaTeX output --------------------------------------------- -# -- Options for LaTeX output ------------------------------------------------- +latex_elements = { + # The paper size ('letterpaper' or 'a4paper'). + # + # 'papersize': 'letterpaper', -latex_elements = {} + # The font size ('10pt', '11pt' or '12pt'). + # + # 'pointsize': '10pt', + + # Additional stuff for the LaTeX preamble. + # + # 'preamble': '', + + # Latex figure (float) alignment + # + # 'figure_align': 'htbp', +} # Grouping the document tree into LaTeX files. List of tuples -# (source start file, target name, title, author, documentclass -# [howto/manual]). +# (source start file, target name, title, +# author, documentclass [howto, manual, or own class]). latex_documents = [ ('index', 'Pywikibot.tex', 'Pywikibot Documentation', 'Pywikibot team', 'manual'), @@ -199,26 +283,27 @@ # The name of an image file (relative to this directory) to place at the top of # the title page. -# latex_logo = None - -# For "manual" documents, if this is true, then toplevel headings are parts, -# not chapters. -# latex_use_parts = False +# +# latex_logo = None # If true, show page references after internal links. -# latex_show_pagerefs = False +# +# latex_show_pagerefs = False # If true, show URL addresses after external links. -# latex_show_urls = False +# +# latex_show_urls = False # Documents to append as an appendix to all manuals. -# latex_appendices = [] +# +# latex_appendices = [] # If false, no module index is generated. -# latex_domain_indices = True +# +# latex_domain_indices = True -# -- Options for manual page output ------------------------------------------- +# -- Options for manual page output --------------------------------------- # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). @@ -228,10 +313,11 @@ ] # If true, show URL addresses after external links. -# man_show_urls = False +# +# man_show_urls = False -# -- Options for Texinfo output ----------------------------------------------- +# -- Options for Texinfo output ------------------------------------------- # Grouping the document tree into Texinfo files. List of tuples # (source start file, target name, title, author, @@ -243,14 +329,20 @@ ] # Documents to append as an appendix to all manuals. -# texinfo_appendices = [] +# +# texinfo_appendices = [] # If false, no module index is generated. -# texinfo_domain_indices = True +# +# texinfo_domain_indices = True # How to display URL addresses: 'footnote', 'no', or 'inline'. -# texinfo_show_urls = 'footnote' +# +# texinfo_show_urls = 'footnote' +# If true, do not generate a @detailmenu in the "Top" node's menu. +# +# texinfo_no_detailmenu = False def pywikibot_script_docstring_fixups(app, what, name, obj, options, lines): """Pywikibot specific conversions.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/664054 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: I10b39a6f1d3a7a161a9d62c2350c8ae935293d2a Gerrit-Change-Number: 664054 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, 2 months

[Gerrit] ...core[master]: [tests] Exclude wikidata from some tests

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/664057 ) Change subject: [tests] Exclude wikidata from some tests ...................................................................... [tests] Exclude wikidata from some tests Bug: T274735 Change-Id: Ic0741c513a48eadfdfc9ee450e8bd823080a34a6 --- M tests/site_tests.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/site_tests.py b/tests/site_tests.py index 077fa1a..39274a5 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -248,7 +248,8 @@ with self.subTest(messages='months', lang1=lang1, lang2=lang2): self.assertLength(mysite.mediawiki_messages(months, lang1), 12) self.assertLength(mysite.mediawiki_messages(months, lang2), 12) - if lang1 != lang2: + familyname = mysite.family.name + if lang1 != lang2 and lang1 != familyname and lang2 != familyname: self.assertNotEqual(mysite.mediawiki_messages(months, lang1), mysite.mediawiki_messages(months, lang2)) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/664057 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: Ic0741c513a48eadfdfc9ee450e8bd823080a34a6 Gerrit-Change-Number: 664057 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, 2 months

[Gerrit] ...core[master]: Do not save the API response from wdeditentity

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/664050 ) Change subject: Do not save the API response from wdeditentity ...................................................................... Do not save the API response from wdeditentity See the last paragraph of https://www.wikidata.org/w/index.php?diff=prev&oldid=1356933963. TLDR: The data does not always exactly correspond to what content the entity has after the update. Change-Id: I594ff3caf18f51ab4455dc976b6c5249f555f576 --- M pywikibot/page/__init__.py 1 file changed, 8 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index 390dfd1..33e70ab 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -3846,8 +3846,14 @@ if getattr(self, 'id', '-1') == '-1': self.__init__(self.repo, updates['entity']['id']) - self._content = updates['entity'] - self.get() + # the response also contains some data under the 'entity' key + # but it is NOT the actual content + # see also [[d:Special:Diff/1356933963]] + # TODO: there might be some circumstances under which + # the content can be safely reused + if hasattr(self, '_content'): + del self._content + self.latest_revision_id = updates['entity'].get('lastrevid') def concept_uri(self): """ -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/664050 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: I594ff3caf18f51ab4455dc976b6c5249f555f576 Gerrit-Change-Number: 664050 Gerrit-PatchSet: 1 Gerrit-Owner: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 2 months

← Newer
1
2
3
4
5
6
7
8
9
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits February 2021