Pywikibot-commits May 2019

pywikibot-commits@lists.wikimedia.org

1 participants
147 discussions

[Gerrit] pywikibot/core[master]: [bugfix] Do not ignore -pattern option in imageharvest.py
by jenkins-bot (Code Review) 31 May '19

31 May '19

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/513564 ) Change subject: [bugfix] Do not ignore -pattern option in imageharvest.py ...................................................................... [bugfix] Do not ignore -pattern option in imageharvest.py -pattern option toggles image_url to True. This must not be overridden in run_bot function. Also fix the compat's [s]top option to break uploading which was never reached currently. Other improvements: - shorten "if url == '':" to "if not url:" - shorten assignments to minimum, maximum and basicdec - use a slice generator for ilinks if image_url is True instead of filling a list Bug: T224714 Change-Id: Ie39862b1ae6f35bb5ab952e78c734c1db96ef06c --- M scripts/imageharvest.py 1 file changed, 32 insertions(+), 43 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/imageharvest.py b/scripts/imageharvest.py index cf41dea..8ec9a09 100644 --- a/scripts/imageharvest.py +++ b/scripts/imageharvest.py @@ -18,7 +18,7 @@ -justshown Choose _only_ images shown on the page, not those linked """ # -# (C) Pywikibot team, 2004-2018 +# (C) Pywikibot team, 2004-2019 # # Distributed under the terms of the MIT license. # @@ -33,6 +33,7 @@ import pywikibot +from pywikibot.bot import QuitKeyboardInterrupt from pywikibot.specialbots import UploadRobot from pywikibot.tools import PY2 @@ -74,61 +75,49 @@ def run_bot(give_url, image_url, desc): """Run the bot.""" url = give_url - image_url = '' - if url == '': + if not url: if image_url: url = pywikibot.input('What URL range should I check ' '(use $ for the part that is changeable)') else: url = pywikibot.input('From what URL should I get the images?') - if image_url: - minimum = 1 - maximum = 99 - answer = pywikibot.input( - 'What is the first number to check (default: 1)') - if answer: - minimum = int(answer) - answer = pywikibot.input( - 'What is the last number to check (default: 99)') - if answer: - maximum = int(answer) - - if not desc: - basicdesc = pywikibot.input( - 'What text should be added at the end of ' - 'the description of each image from this url?') - else: - basicdesc = desc + basicdesc = desc or pywikibot.input( + 'What text should be added at the end of ' + 'the description of each image from this url?') if image_url: - ilinks = [] - i = minimum - while i <= maximum: - ilinks += [url.replace('$', str(i))] - i += 1 + minimum = int(pywikibot.input( + 'What is the first number to check (default: 1)') or 1) + maximum = int(pywikibot.input( + 'What is the last number to check (default: 99)') or 99) + ilinks = (url.replace('$', str(i)) + for i in range(minimum, maximum + 1)) else: ilinks = get_imagelinks(url) for image in ilinks: - if pywikibot.input_yn('Include image {}?'.format(image), default=False, - automatic_quit=False): - desc = pywikibot.input('Give the description of this image:') - categories = [] - while True: - cat = pywikibot.input('Specify a category (or press enter to ' - 'end adding categories)') - if not cat.strip(): - break - if ':' in cat: - categories.append('[[{}]]'.format(cat)) - else: - categories.append('[[{}:{}]]' - .format(mysite.namespace(14), cat)) - desc += '\n\n' + basicdesc + '\n\n' + '\n'.join(categories) - UploadRobot(image, description=desc).run() - elif answer == 's': + try: + include = pywikibot.input_yn('Include image {}?'.format(image), + default=False) + except QuitKeyboardInterrupt: break + if not include: + continue + desc = pywikibot.input('Give the description of this image:') + categories = [] + while True: + cat = pywikibot.input('Specify a category (or press enter to ' + 'end adding categories)') + if not cat.strip(): + break + if ':' in cat: + categories.append('[[{}]]'.format(cat)) + else: + categories.append('[[{}:{}]]' + .format(mysite.namespace(14), cat)) + desc += '\n\n' + basicdesc + '\n\n' + '\n'.join(categories) + UploadRobot(image, description=desc).run() def main(*args): -- To view, visit https://gerrit.wikimedia.org/r/513564 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie39862b1ae6f35bb5ab952e78c734c1db96ef06c Gerrit-Change-Number: 513564 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [FEAT] Suggest help for missing dependencies in scripts
by jenkins-bot (Code Review) 31 May '19

31 May '19

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/509907 ) Change subject: [FEAT] Suggest help for missing dependencies in scripts ...................................................................... [FEAT] Suggest help for missing dependencies in scripts - standardize missing dependencies exceptions across scripts - suggest help if dependency is missing - unify behavior for tests (e.g. script_tests) Change-Id: I8e96dd816d73184e072f5a5b7e400d39ed9851fd --- M pywikibot/bot.py M scripts/data_ingestion.py M scripts/flickrripper.py M scripts/imageharvest.py M scripts/match_images.py M scripts/patrol.py M scripts/states_redirect.py M scripts/weblinkchecker.py 8 files changed, 54 insertions(+), 25 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/bot.py b/pywikibot/bot.py index 954d07f..e161e27 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -1050,7 +1050,8 @@ def suggest_help(missing_parameters=[], missing_generator=False, unknown_parameters=[], exception=None, - missing_action=False, additional_text=''): + missing_action=False, additional_text='', + missing_dependencies=[]): """ Output error message to use -help with additional text before it. @@ -1066,6 +1067,9 @@ @type missing_action: bool @param additional_text: Additional text added to the end. @type additional_text: str + @param missing_dependencies: A list of dependencies which can not + be imported. + @type missing_dependencies: list of str """ messages = [] if exception: @@ -1083,6 +1087,11 @@ messages.append('Unknown parameter{s} "{params}".' .format(s='s' if len(unknown_parameters) > 1 else '', params='", "'.join(unknown_parameters))) + if missing_dependencies: + messages.append('Missing dependenc{s} "{deps}".' + .format( + s='ies' if len(missing_dependencies) > 1 else 'y', + deps='", "'.join(missing_dependencies))) if additional_text: messages.append(additional_text.strip()) if messages: diff --git a/scripts/data_ingestion.py b/scripts/data_ingestion.py index 149d8f1..ce846a0 100755 --- a/scripts/data_ingestion.py +++ b/scripts/data_ingestion.py @@ -32,7 +32,10 @@ import csv from urllib.parse import urlparse else: - import unicodecsv as csv + try: + import unicodecsv as csv + except ImportError as e: + csv = e from urlparse import urlparse @@ -261,10 +264,16 @@ config_generator = genFactory.getCombinedGenerator() - if not config_generator or not csv_dir: + if isinstance(csv, ImportError): + missing_dependencies = ('unicodecsv',) + else: + missing_dependencies = None + + if not config_generator or not csv_dir or missing_dependencies: pywikibot.bot.suggest_help( missing_parameters=[] if csv_dir else ['-csvdir'], - missing_generator=not config_generator) + missing_generator=not config_generator, + missing_dependencies=missing_dependencies) return False for config_page in config_generator: diff --git a/scripts/flickrripper.py b/scripts/flickrripper.py index c9cb22f..3b1b62c 100755 --- a/scripts/flickrripper.py +++ b/scripts/flickrripper.py @@ -501,14 +501,15 @@ elif arg == '-autonomous': autonomous = True - if isinstance(flickrapi, Exception): - pywikibot.error('This script requires the python flickrapi module. \n' - 'See: http://stuvel.eu/projects/flickrapi') + if isinstance(flickrapi, ImportError): + pywikibot.bot.suggest_help(missing_dependencies=('flickrapi',)) elif not config.flickr['api_key']: - pywikibot.warning('Flickr api key not found! Get yourself an api key\n' - 'Any flickr user can get a key at\n' - 'https://www.flickr.com/services/api/keys/apply/') + additional_message = ( + 'Flickr api key not found! Get yourself an api key\n' + 'Any flickr user can get a key at\n' + 'https://www.flickr.com/services/api/keys/apply/') + pywikibot.bot.suggest_help(additional_message=additional_message) elif user_id or group_id or photoset_id: if 'api_secret' in config.flickr and config.flickr['api_secret']: diff --git a/scripts/imageharvest.py b/scripts/imageharvest.py index cf41dea..c4f9607 100644 --- a/scripts/imageharvest.py +++ b/scripts/imageharvest.py @@ -154,7 +154,10 @@ desc = ' '.join(desc) mysite = pywikibot.Site() - run_bot(url, image_url, desc) + try: + run_bot(url, image_url, desc) + except ImportError: + pywikibot.bot.suggest_help(missing_dependencies=('beautifulsoup4',)) if __name__ == '__main__': diff --git a/scripts/match_images.py b/scripts/match_images.py index 69607ed..442e944 100755 --- a/scripts/match_images.py +++ b/scripts/match_images.py @@ -172,10 +172,12 @@ additional_text = ('Unable to execute script because it ' 'requires two images to work on.' if len(images) != 2 else None) - exception = Image if isinstance(Image, Exception) else None + missing_dependencies = ('Pillow',) if isinstance( + Image, ImportError) else None - if additional_text or exception: - suggest_help(exception=exception, additional_text=additional_text) + if additional_text or missing_dependencies: + suggest_help(missing_dependencies=missing_dependencies, + additional_text=additional_text) return False imagePageA = pywikibot.page.FilePage(pywikibot.Site(), diff --git a/scripts/patrol.py b/scripts/patrol.py index a07ed54..318c46a 100755 --- a/scripts/patrol.py +++ b/scripts/patrol.py @@ -61,7 +61,7 @@ from pywikibot import pagegenerators -from pywikibot.bot import SingleSiteBot, QuitKeyboardInterrupt +from pywikibot.bot import SingleSiteBot, QuitKeyboardInterrupt, suggest_help _logger = 'patrol' @@ -127,7 +127,7 @@ def load_whitelist(self): """Load most recent watchlist_page for further processing.""" - if isinstance(mwparserfromhell, Exception): + if isinstance(mwparserfromhell, ImportError): raise mwparserfromhell # Check for a more recent version after versionchecktime in sec. if (self.whitelist_load_ts and (time.time() - self.whitelist_load_ts @@ -479,6 +479,10 @@ bot = PatrolBot(**options) + if isinstance(mwparserfromhell, ImportError): + suggest_help(missing_dependencies=('mwparserfromhell',)) + return + if newpages or usercontribs: pywikibot.output('Newpages:') gen = site.newpages diff --git a/scripts/states_redirect.py b/scripts/states_redirect.py index 7b1e8a1..8f4ac5b 100755 --- a/scripts/states_redirect.py +++ b/scripts/states_redirect.py @@ -134,16 +134,14 @@ else: unknown_parameters.append(arg) - if isinstance(pycountry, Exception): - additional_text = ('This script requires the python-pycountry module\n' - 'See: https://pypi.org/project/pycountry') - exception = pycountry + if isinstance(pycountry, ImportError): + missing_dependencies = ('pycountry',) else: - additional_text = exception = None + missing_dependencies = None - if additional_text or exception or unknown_parameters: + if missing_dependencies or unknown_parameters: suggest_help(unknown_parameters=unknown_parameters, - exception=exception, additional_text=additional_text) + missing_dependencies=missing_dependencies) return bot = StatesRedirectBot(start, force) diff --git a/scripts/weblinkchecker.py b/scripts/weblinkchecker.py index f8cb5ca..a00b34a 100755 --- a/scripts/weblinkchecker.py +++ b/scripts/weblinkchecker.py @@ -135,7 +135,7 @@ comms, i18n, config, pagegenerators, textlib, weblib, config2, ) -from pywikibot.bot import ExistingPageBot, SingleSiteBot +from pywikibot.bot import ExistingPageBot, SingleSiteBot, suggest_help from pywikibot.pagegenerators import ( XMLDumpPageGenerator as _XMLDumpPageGenerator, ) @@ -1015,6 +1015,9 @@ bot = WeblinkCheckerRobot(gen, HTTPignore, config.weblink_dead_days) try: bot.run() + except ImportError: + suggest_help(missing_dependencies=('memento_client',)) + return False finally: waitTime = 0 # Don't wait longer than 30 seconds for threads to finish. @@ -1047,7 +1050,7 @@ bot.history.save() return True else: - pywikibot.bot.suggest_help(missing_generator=True) + suggest_help(missing_generator=True) return False -- To view, visit https://gerrit.wikimedia.org/r/509907 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I8e96dd816d73184e072f5a5b7e400d39ed9851fd Gerrit-Change-Number: 509907 Gerrit-PatchSet: 6 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [tests] Fix similar code checking in codeclimate
by jenkins-bot (Code Review) 31 May '19

31 May '19

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/513316 ) Change subject: [tests] Fix similar code checking in codeclimate ...................................................................... [tests] Fix similar code checking in codeclimate similar-code threshold describes the mass code block to be analyzed for duplication. This was mistakenly decreased from default 32 to 2. The count threshold should be increased instead. Refer https://github.com/codeclimate/codeclimate-duplication for this settings Change-Id: Idec34f3d3571d81ea9544dd20c398c580ead3625 --- M .codeclimate.yml 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/.codeclimate.yml b/.codeclimate.yml index d671f0f..2b6b811 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -13,9 +13,12 @@ method-lines: config: threshold: 30 - similar-code: + +plugins: + duplication: + enabled: true config: - threshold: 3 + count_threshold: 3 exclude_patterns: - "docs/" -- To view, visit https://gerrit.wikimedia.org/r/513316 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idec34f3d3571d81ea9544dd20c398c580ead3625 Gerrit-Change-Number: 513316 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [docs] Add @rtype for Page.getReferences and related methods
by jenkins-bot (Code Review) 31 May '19

31 May '19

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/513544 ) Change subject: [docs] Add @rtype for Page.getReferences and related methods ...................................................................... [docs] Add @rtype for Page.getReferences and related methods Page.getReferences, APISite.pagebacklinks, APISite.pagereferences, and APISite.page_embeddedin return an iterable of page objects. Also explicitly use typing.Iterable instead of Iterable so that it won't be confused with collections.abc.Iterable (which does not support __getitem__ protocol). Replace pywikibot.APISite which does not exist with pywikibot.site.APISite. + Other minor changes. Change-Id: Ic1aaa6b18300465c7158f6bc00a04bbe24696a93 --- M pywikibot/page.py M pywikibot/site.py M pywikibot/textlib.py M tests/aspects.py 4 files changed, 19 insertions(+), 15 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page.py b/pywikibot/page.py index b7f2dbc..97edd3b 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -917,7 +917,7 @@ not actually exist on the wiki. @return: Page or None if self is a special page. - @rtype: Page or None + @rtype: typing.Optional[pywikibot.Page] """ ns = self.namespace() if ns < 0: # Special page @@ -1039,6 +1039,7 @@ @param total: iterate no more than this number of pages in total @param content: if True, retrieve the content of the current version of each referring page (default False) + @rtype: typing.Iterable[pywikibot.Page] """ # N.B.: this method intentionally overlaps with backlinks() and # embeddedin(). Depending on the interface, it may be more efficient @@ -3417,7 +3418,7 @@ page title (optional) @type subpage: str @return: Page object of user page or user subpage - @rtype: Page + @rtype: pywikibot.Page """ if self._isAutoblock: # This user is probably being queried for purpose of lifting @@ -3436,7 +3437,7 @@ talk page title (optional) @type subpage: str @return: Page object of user talk page or user talk subpage - @rtype: Page + @rtype: pywikibot.Page """ if self._isAutoblock: # This user is probably being queried for purpose of lifting diff --git a/pywikibot/site.py b/pywikibot/site.py index d074b6c..388964c 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -1878,9 +1878,9 @@ @param dbname: database name @type dbname: str @param site: Site to load sitematrix from. (Default meta.wikimedia.org) - @type site: APISite + @type site: pywikibot.site.APISite @return: site object for the database name - @rtype: APISite + @rtype: pywikibot.site.APISite """ # TODO this only works for some WMF sites if not site: @@ -3652,6 +3652,7 @@ @param total: Maximum number of pages to retrieve in total. @param content: if True, load the current content of each iterated page (default False) + @rtype: typing.Iterable[pywikibot.Page] @raises KeyError: a namespace identifier was not resolved @raises TypeError: a namespace identifier has an inappropriate type such as NoneType or bool @@ -3711,6 +3712,7 @@ list of namespace identifiers. @param content: if True, load the current content of each iterated page (default False) + @rtype: typing.Iterable[pywikibot.Page] @raises KeyError: a namespace identifier was not resolved @raises TypeError: a namespace identifier has an inappropriate type such as NoneType or bool @@ -3742,6 +3744,7 @@ @type namespaces: iterable of basestring or Namespace key, or a single instance of those types. May be a '|' separated list of namespace identifiers. + @rtype: typing.Iterable[pywikibot.Page] @raises KeyError: a namespace identifier was not resolved @raises TypeError: a namespace identifier has an inappropriate type such as NoneType or bool @@ -6905,7 +6908,7 @@ shows all protection levels. @type level: str or False @return: The pages which are protected. - @rtype: Iterable[pywikibot.Page] + @rtype: typing.Iterable[pywikibot.Page] """ namespaces = self.namespaces.resolve(namespace) # always assert that, so we are be sure that type could be 'create' @@ -7028,7 +7031,7 @@ @type lint_from: str representing digit or integer @return: pages with Linter errors. - @rtype: Iterable[pywikibot.Page] + @rtype: typing.Iterable[pywikibot.Page] """ query = self._generator(api.ListGenerator, type_arg='linterrors', diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index b0ee716..d92bc93 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -644,7 +644,7 @@ callable @param site: a Site object to use. It should match the origin or target site of the text - @type site: pywikibot.APISite + @type site: pywikibot.site.APISite """ def to_link(source): """Return the link from source when it's a Page otherwise itself.""" diff --git a/tests/aspects.py b/tests/aspects.py index 09e817e..4d7e6bc 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -183,11 +183,11 @@ if additional items are in the iterator. @param gen: Page generator - @type gen: Iterable[pywikibot.BasePage] + @type gen: typing.Iterable[pywikibot.Page] @param count: number of pages to get @type count: int @param site: Site of expected pages - @type site: pywikibot.APISite + @type site: pywikibot.site.APISite """ original_iter = iter(gen) @@ -271,11 +271,11 @@ Only iterates to the length of titles plus two. @param gen: Page generator - @type gen: Iterable[pywikibot.BasePage] + @type gen: typing.Iterable[pywikibot.Page] @param titles: Expected titles @type titles: iterator @param site: Site of expected pages - @type site: pywikibot.APISite + @type site: pywikibot.site.APISite """ titles = self._get_canonical_titles(titles, site) gen_titles = self._get_gen_titles(gen, len(titles), site) @@ -288,11 +288,11 @@ Only iterates to the length of titles plus two. @param gen: Page generator - @type gen: Iterable[pywikibot.BasePage] + @type gen: typing.Iterable[pywikibot.Page] @param titles: Expected titles @type titles: iterator @param site: Site of expected pages - @type site: pywikibot.APISite + @type site: pywikibot.site.APISite """ titles = self._get_canonical_titles(titles, site) gen_titles = self._get_gen_titles(gen, len(titles), site) @@ -1065,7 +1065,7 @@ """Create a Page object for the sites main page. @param site: Override current site, obtained using L{get_site}. - @type site: pywikibot.APISite or None + @type site: pywikibot.site.APISite or None @param force: Get an unused Page object @type force: bool @rtype: pywikibot.Page -- To view, visit https://gerrit.wikimedia.org/r/513544 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic1aaa6b18300465c7158f6bc00a04bbe24696a93 Gerrit-Change-Number: 513544 Gerrit-PatchSet: 1 Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [tests] Give a better failure message for paraminfo_tests
by jenkins-bot (Code Review) 30 May '19

30 May '19

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/497101 ) Change subject: [tests] Give a better failure message for paraminfo_tests ...................................................................... [tests] Give a better failure message for paraminfo_tests Currently we get an assertion error listing two sets when the first set is not greater or equal than the second. Now calculate the difference which values are in the second and not in the first set as expected. This is an improvement to detect the missing parameter in the first. Bug: T218506 Change-Id: Ibcdffd5050c136805d48bf5dddd67011d81d84d7 --- M tests/paraminfo_tests.py 1 file changed, 6 insertions(+), 1 deletion(-) Approvals: Dvorapa: Looks good to me, but someone else must approve Lokal Profil: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/paraminfo_tests.py b/tests/paraminfo_tests.py index 8ae81d0..63e501a 100644 --- a/tests/paraminfo_tests.py +++ b/tests/paraminfo_tests.py @@ -49,7 +49,12 @@ def _check_param_superset(self, site, module, parameter, expected): """Check that a parameter only contains entries in expected list.""" values = self._get_param_values(site, module, parameter) - self.assertGreaterEqual(set(expected), set(values)) + exp = set(expected) + val = set(values) + if not exp.issuperset(val): + diff = val - exp + self.fail('Unexpected param{} {} in values' + .format('s' if len(diff) > 1 else '', diff)) class MediaWikiKnownTypesTestCase(KnownTypesTestBase, -- To view, visit https://gerrit.wikimedia.org/r/497101 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ibcdffd5050c136805d48bf5dddd67011d81d84d7 Gerrit-Change-Number: 497101 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Lokal Profil <andre.costa(a)wikimedia.se> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [bugfix] Show page list at the end of the script
by jenkins-bot (Code Review) 30 May '19

30 May '19

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/503736 ) Change subject: [bugfix] Show page list at the end of the script ...................................................................... [bugfix] Show page list at the end of the script With -get option the page content is printed after the page title but complete title list is not printed in this case. Bug: T220905 Change-Id: I65bb48d733cb92864694b9180d5e040a19cb6b98 --- M scripts/listpages.py 1 file changed, 6 insertions(+), 3 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/listpages.py b/scripts/listpages.py index 1ec6268..1292c20 100755 --- a/scripts/listpages.py +++ b/scripts/listpages.py @@ -259,8 +259,9 @@ if not notitle: page_fmt = Formatter(page, outputlang) output_list += [page_fmt.output(num=i, fmt=fmt)] - pywikibot.stdout(output_list[-1]) if page_get: + if output_list: + pywikibot.stdout(output_list.pop(-1)) try: pywikibot.stdout(page.text) except pywikibot.Error as err: @@ -271,10 +272,12 @@ .format(page.title(), filename)) with open(filename, mode='wb') as f: f.write(page.text.encode(encoding)) - pywikibot.output('{0} page(s) found'.format(i)) + text = '\n'.join(output_list) if page_target: - page_target.text = '\n'.join(output_list) + page_target.text = text page_target.save(summary=summary) + pywikibot.stdout(text) + pywikibot.output('{0} page(s) found'.format(i)) return True else: pywikibot.bot.suggest_help(missing_generator=True) -- To view, visit https://gerrit.wikimedia.org/r/503736 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I65bb48d733cb92864694b9180d5e040a19cb6b98 Gerrit-Change-Number: 503736 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/i18n[master]: Localisation updates from https://translatewiki.net.
by jenkins-bot (Code Review) 30 May '19

30 May '19

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/513324 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: If054b8d7b4d709766ab4a7f66d30e55b4bf2b5c2 --- M category/ta.json M checkimages/sr.json A commons_link/ta.json A commonscat/ta.json A disambredir/ta.json A image/ta.json A imagetransfer/ta.json A listpages/ta.json A misspelling/ta.json M noreferences/ta.json A protect/ta.json A pywikibot/ta.json A selflink/ta.json M template/ta.json M welcome/ta.json 15 files changed, 101 insertions(+), 10 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/category/ta.json b/category/ta.json index 0189371..5c9f51d 100644 --- a/category/ta.json +++ b/category/ta.json @@ -1,13 +1,15 @@ { "@metadata": { "authors": [ - "செல்வா" + "செல்வா", + "Aswn" ] }, - "category-adding": "தானியங்கிஇணைப்பு category [[:Category:%(newcat)s|%(newcat)s]]", - "category-also-in": "( %(alsocat)s உம் உள்ளது)", + "category-adding": "தானியங்கி:[[:பகுப்பு:%(newcat)s|%(newcat)s]] இணைத்தல்", + "category-also-in": "( %(alsocat)s-உம் உள்ளது)", "category-listifying": "தானியக்கி: %(fromcat)s இல் இருந்து (%(num)d என்னும் உள்ளிடுகைகள்) -உக்கு பட்டியலிடப்படுகின்றது", "category-removing": "தானியங்கி: %(oldcat)s இல் இருந்து நீக்குகின்றது", "category-replacing": "தானியங்கி: வகைப்பாடு %(oldcat)s ஐ %(newcat)s ஆக மாற்றுகின்றன", - "category-was-moved": "தானியங்கி: வகைப்பாடு [[:Category:%(newcat)s|%(title)s]] உக்கு நகர்த்தப்பட்டது" + "category-was-disbanded": "தானியங்கி:பகுப்பு கலைக்கப்பட்டது", + "category-was-moved": "தானியங்கி: பகுப்பு [[:பகுப்பு:%(newcat)s|%(title)s]]-இற்கு நகர்த்தப்பட்டது" } diff --git a/checkimages/sr.json b/checkimages/sr.json index 8a1f856..deb7975 100644 --- a/checkimages/sr.json +++ b/checkimages/sr.json @@ -6,11 +6,12 @@ "Milicevic01", "Rancher", "xqt", - "Zoranzoki21" + "Zoranzoki21", + "Xqt" ] }, "checkimages-deletion-comment": "Бот: Додајем %(adding)s", - "checkimages-doubles-file-comment": "Бот: Датотека већ постоји на Остави", + "checkimages-doubles-file-comment": "Бот: Датотека већ постоји на Остави, можда ће бити избрисана", "checkimages-doubles-head": "Дупликат датотеке", "checkimages-doubles-talk-comment": "Бот: Обавештење о томе да датотека већ постоји на Остави", "checkimages-log-comment": "Бот: Ажурирање дневника", diff --git a/commons_link/ta.json b/commons_link/ta.json new file mode 100644 index 0000000..0891096 --- /dev/null +++ b/commons_link/ta.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Aswn" + ] + }, + "commons_link-cat-template-added": "தானியங்கி: காமன்சுபகுப்பு வார்ப்புருவினை இணைத்தல்", + "commons_link-template-added": "தானியங்கி: காமன்சு வார்ப்புருவினை இணைத்தல்" +} diff --git a/commonscat/ta.json b/commonscat/ta.json new file mode 100644 index 0000000..cb682fb --- /dev/null +++ b/commonscat/ta.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Aswn" + ] + }, + "commonscat-msg_change": "தானியங்கி: காமன்சுபகுப்பு %(oldcat)s இலிருந்து %(newcat)s இற்கு நகர்த்தப்படுகின்றது" +} diff --git a/disambredir/ta.json b/disambredir/ta.json new file mode 100644 index 0000000..ac076ba --- /dev/null +++ b/disambredir/ta.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Aswn" + ] + }, + "disambredir-msg": "பக்கவழி நெறிப்படுத்தல் பக்கத்தில் வழிமாற்றுகளை மாற்றுதல்" +} diff --git a/image/ta.json b/image/ta.json new file mode 100644 index 0000000..9156c54 --- /dev/null +++ b/image/ta.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Aswn" + ] + }, + "image-remove": "தானியங்கி:%(file)s படிமங்களை நீக்குதல்", + "image-replace": "தானியங்கி:%(old)s %(new)s இற்கு மாற்றப்படுகின்றது" +} diff --git a/imagetransfer/ta.json b/imagetransfer/ta.json new file mode 100644 index 0000000..b323af3 --- /dev/null +++ b/imagetransfer/ta.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Aswn" + ] + }, + "imagetransfer-nowcommons_notice": "விக்கிமீடியா காமன்சில் படிமம் கிடைக்கும்" +} diff --git a/listpages/ta.json b/listpages/ta.json new file mode 100644 index 0000000..c20b62f --- /dev/null +++ b/listpages/ta.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Aswn" + ] + }, + "listpages-save-list": "தானியங்கி:உருவாக்கப்பட்ட பக்கங்கள் பட்டியலினை சேமி" +} diff --git a/misspelling/ta.json b/misspelling/ta.json new file mode 100644 index 0000000..2b7fb5c --- /dev/null +++ b/misspelling/ta.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Aswn" + ] + }, + "misspelling-fixing": "தானியங்கி: %(page)s இல் எழுத்துப்பிழைகள் திருத்தப்படுகின்றது" +} diff --git a/noreferences/ta.json b/noreferences/ta.json index 926ba73..08448fb 100644 --- a/noreferences/ta.json +++ b/noreferences/ta.json @@ -4,5 +4,6 @@ "Aswn" ] }, - "noreferences-add-tag": "தானியங்கி: <references /> குறியீடினை இணைத்தல்" + "noreferences-add-tag": "தானியங்கி: <references /> குறியீடினை இணைத்தல்", + "noreferences-fix-tag": "தானியங்கி: பிழையான <references /> இனைத் திருத்துதல்" } diff --git a/protect/ta.json b/protect/ta.json new file mode 100644 index 0000000..c4f6b4b --- /dev/null +++ b/protect/ta.json @@ -0,0 +1,12 @@ +{ + "@metadata": { + "authors": [ + "Aswn" + ] + }, + "protect-category": "தானியங்கி: %(cat)s பகுப்பில் உள்ள அனைத்து பக்கங்களும் பாதுகாக்கப்படுகின்றன", + "protect-images": "தானியங்கி:%(page)s பக்கத்திலுள்ள அனைத்துக் கோப்புகளும் பாதுகாக்கப்படுகின்றன", + "protect-links": "தானியங்கி:%(page)s பக்கத்துடன் இணைக்கப்பட்டுள்ள அனைத்து பக்கங்களும் காக்கப்படுகின்றன", + "protect-ref": "தானியங்கி:%(page)s பக்கத்திற்கு குறியிடும் அனைத்து பக்கங்களும் காக்கப்படுகின்றன", + "protect-simple": "தானியங்கி: ஒரு பட்டியலிலுள்ள கோப்புகள் காக்கப்படுகின்றன." +} diff --git a/pywikibot/ta.json b/pywikibot/ta.json new file mode 100644 index 0000000..62f8098 --- /dev/null +++ b/pywikibot/ta.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Aswn" + ] + }, + "pywikibot-enter-category-name": "பகுப்பின் பெயரை இடவும்:" +} diff --git a/selflink/ta.json b/selflink/ta.json new file mode 100644 index 0000000..6f550c3 --- /dev/null +++ b/selflink/ta.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Aswn" + ] + }, + "selflink-remove": "தானியங்கி:பிழையான இணைப்புகளை நீக்குதல்" +} diff --git a/template/ta.json b/template/ta.json index a3b41d0..6274324 100644 --- a/template/ta.json +++ b/template/ta.json @@ -5,5 +5,6 @@ ] }, "template-changing": "தானியங்கி:{{PLURAL:%(num)d|வார்ப்புரு|வார்ப்புருக்கள்}} மாற்றப்பட்டது: %(list)s", - "template-removing": "தானியங்கி: {{PLURAL:%(num)d|வார்ப்புரு|வார்ப்புருக்கள்}} நீக்கப்பட்டது: %(list)s" + "template-removing": "தானியங்கி: {{PLURAL:%(num)d|வார்ப்புரு|வார்ப்புருக்கள்}} நீக்கப்பட்டது: %(list)s", + "template-substituting": "தானியங்கி:{{PLURAL:%(num)d|வார்ப்புரு|வார்ப்புருக்கள்}} மாற்றப்பட்டது: %(list)s" } diff --git a/welcome/ta.json b/welcome/ta.json index 1abdb8e..8cd67cb 100644 --- a/welcome/ta.json +++ b/welcome/ta.json @@ -5,7 +5,7 @@ "Karthi.dr" ] }, - "welcome-bad_username": "தானியங்கி: பயனர் பெயரைச் சேர்ப்பதை சோதிக்க வேண்டும்.", + "welcome-bad_username": "தானியங்கி: பயனர் பெயரைச் சேர்ப்பதை சரிபார்க்க வேண்டும்.", "welcome-updating": "தானியங்கி: பதிவேடு புதுப்பிக்கப்படுகிறது", - "welcome-welcome": "வருக ! வணக்கம் !" + "welcome-welcome": "வணக்கம் !" } -- To view, visit https://gerrit.wikimedia.org/r/513324 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: If054b8d7b4d709766ab4a7f66d30e55b4bf2b5c2 Gerrit-Change-Number: 513324 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 (75)

1 0

[Gerrit] pywikibot/core[master]: Revert "A BaseSite subclass for non MW sites."
by jenkins-bot (Code Review) 30 May '19

30 May '19

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/513305 ) Change subject: Revert "A BaseSite subclass for non MW sites." ...................................................................... Revert "A BaseSite subclass for non MW sites." A Site that does nothing except raising exceptions is not an appropriate implementation. Refer PEP20: Now is better than never. Although never is often better than *right* now. Pretty sure the last fits here since 4 years This reverts commit 46a3a8525e59218c371af7f77366ed831427b7f4. Change-Id: Idfe3add9d80a10cde060fbbb4273a1df004a6525 --- M pywikibot/site.py M tests/site_tests.py 2 files changed, 0 insertions(+), 40 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/site.py b/pywikibot/site.py index d074b6c..47ccc63 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -1820,25 +1820,6 @@ super(RemovedSite, self).__init__(code, fam, user, sysop) -class NonMWAPISite(BaseSite): - - """API interface to non MediaWiki sites.""" - - def __init__(self, url): - """Initializer.""" - self.netloc = urlparse(url).netloc - - def __getattribute__(self, attr): - """Return attribute if present else raise NotImplementedError.""" - whitelist = ['__getattribute__', 'netloc'] - if attr in whitelist: - return super(NonMWAPISite, self).__getattribute__(attr) - else: - raise NotImplementedError('The attribute %s has not been on ' - 'site %s implemented yet.' - % (attr, self.netloc)) - - class APISite(BaseSite): """ diff --git a/tests/site_tests.py b/tests/site_tests.py index dd8f68f..d4baea1 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -3531,27 +3531,6 @@ pywikibot.Site, 'en', 'wikidata') -class TestNonMWAPISite(TestCase): - - """Test the BaseSite subclass, site.NonMWAPISite.""" - - net = False - - def test_non_mw_sites(self): - """Test NonMWAPISite for sites not using MediaWiki.""" - self._run_test('http://moinmo.in/$1') - self._run_test('http://twiki.org/cgi-bin/view/$1') - self._run_test('http://www.usemod.com/cgi-bin/wiki.pl?$1') - self._run_test('https://developer.mozilla.org/en/docs/$1') - self._run_test('http://www.tvtropes.org/pmwiki/pmwiki.php/Main/$1') - - def _run_test(self, url): - """Run test method.""" - site = pywikibot.site.NonMWAPISite(url) - with self.assertRaises(NotImplementedError): - site.attr - - class TestSiteProofreadinfo(DefaultSiteTestCase): """Test proofreadinfo information.""" -- To view, visit https://gerrit.wikimedia.org/r/513305 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Idfe3add9d80a10cde060fbbb4273a1df004a6525 Gerrit-Change-Number: 513305 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Ladsgroup <Ladsgroup(a)gmail.com> Gerrit-Reviewer: Maverick <manpreetkaur9411(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [tests] Change codeclimate maintainability rules
by jenkins-bot (Code Review) 30 May '19

30 May '19

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/513301 ) Change subject: [tests] Change codeclimate maintainability rules ...................................................................... [tests] Change codeclimate maintainability rules Increase threshold values: - argument-count 4 -> 7 - file-lines 250 -> 30 x 30 - method-count 20 -> 30 - method-lines 25 -> 30 - similar-code 2 -> 3 Change-Id: I0f94f286e6766ff7d5073192e8fa673b5cdda99f --- M .codeclimate.yml 1 file changed, 13 insertions(+), 2 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/.codeclimate.yml b/.codeclimate.yml index 8127d48..d671f0f 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -2,9 +2,20 @@ checks: argument-count: - enabled: false + config: + threshold: 7 file-lines: - enabled: false + config: + threshold: 900 + method-count: + config: + threshold: 30 + method-lines: + config: + threshold: 30 + similar-code: + config: + threshold: 3 exclude_patterns: - "docs/" -- To view, visit https://gerrit.wikimedia.org/r/513301 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0f94f286e6766ff7d5073192e8fa673b5cdda99f Gerrit-Change-Number: 513301 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [IMPR] Use assertLength/assertIsEmpty/assertIsNotEmpty
by jenkins-bot (Code Review) 30 May '19

30 May '19

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/509808 ) Change subject: [IMPR] Use assertLength/assertIsEmpty/assertIsNotEmpty ...................................................................... [IMPR] Use assertLength/assertIsEmpty/assertIsNotEmpty Additional changes in assertIsEmpty/assertIsNotEmpty/assertLength: - check whether seq argument of these methods is of type collections.abc.Sized i.e has a __len__ attribute - use fail method instead of raising failureException Change-Id: Ic136f9a826b6f57df00b038524412887370c01a8 --- M tests/api_tests.py M tests/aspects.py M tests/compat2core_tests.py M tests/site_tests.py 4 files changed, 49 insertions(+), 43 deletions(-) Approvals: Lokal Profil: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/api_tests.py b/tests/api_tests.py index c7b6cb4..05a6af7 100644 --- a/tests/api_tests.py +++ b/tests/api_tests.py @@ -162,10 +162,10 @@ self.assertEqual(req._params['one'], ['1']) # test compliance with dict interface # req.keys() should contain 'action', 'foo', 'bar', 'one' - self.assertEqual(len(req.keys()), 4) + self.assertLength(req.keys(), 4) self.assertIn('test', req._encoded_items().values()) for item in req.items(): - self.assertEqual(len(item), 2, item) + self.assertLength(item, 2) @suppress_warnings( 'Instead of using kwargs |Both kwargs and parameters are set', @@ -189,12 +189,12 @@ """Test common initialization.""" site = self.get_site() pi = api.ParamInfo(site) - self.assertEqual(len(pi), 0) + self.assertIsEmpty(pi) pi._init() self.assertIn('main', pi._paraminfo) self.assertIn('paraminfo', pi._paraminfo) - self.assertEqual(len(pi), len(pi.preloaded_modules)) + self.assertLength(pi, pi.preloaded_modules) self.assertIn('info', pi.query_modules) self.assertIn('login', pi._action_modules) @@ -212,7 +212,7 @@ assert 'query' not in modules original_generate_submodules(modules) pi = api.ParamInfo(self.site, {'query', 'main'}) - self.assertEqual(len(pi), 0) + self.assertIsEmpty(pi) original_generate_submodules = pi._generate_submodules pi._generate_submodules = patched_generate_submodules pi._init() @@ -225,7 +225,7 @@ self.assertNotIn('query', api.ParamInfo.init_modules) pi = api.ParamInfo(site, {'pageset'}) self.assertNotIn('query', api.ParamInfo.init_modules) - self.assertEqual(len(pi), 0) + self.assertIsEmpty(pi) pi._init() self.assertIn('main', pi._paraminfo) @@ -234,13 +234,12 @@ if 'query' in pi.preloaded_modules: self.assertIn('query', pi._paraminfo) - self.assertEqual(len(pi), 4) + self.assertLength(pi, 4) else: self.assertNotIn('query', pi._paraminfo) - self.assertEqual(len(pi), 3) + self.assertLength(pi, 3) - self.assertEqual(len(pi), - len(pi.preloaded_modules)) + self.assertLength(pi, pi.preloaded_modules) if site.mw_version >= '1.21': # 'generator' was added to 'pageset' in 1.21 @@ -251,7 +250,7 @@ """Test requesting the generator parameter.""" site = self.get_site() pi = api.ParamInfo(site, {'pageset', 'query'}) - self.assertEqual(len(pi), 0) + self.assertIsEmpty(pi) pi._init() self.assertIn('main', pi._paraminfo) @@ -270,13 +269,13 @@ """Test requesting the module info.""" site = self.get_site() pi = api.ParamInfo(site) - self.assertEqual(len(pi), 0) + self.assertIsEmpty(pi) pi.fetch(['info']) self.assertIn('query+info', pi._paraminfo) self.assertIn('main', pi._paraminfo) self.assertIn('paraminfo', pi._paraminfo) - self.assertEqual(len(pi), 1 + len(pi.preloaded_modules)) + self.assertLength(pi, 1 + len(pi.preloaded_modules)) self.assertEqual(pi['info']['prefix'], 'in') @@ -294,13 +293,13 @@ """Test requesting the module revisions.""" site = self.get_site() pi = api.ParamInfo(site) - self.assertEqual(len(pi), 0) + self.assertIsEmpty(pi) pi.fetch(['revisions']) self.assertIn('query+revisions', pi._paraminfo) self.assertIn('main', pi._paraminfo) self.assertIn('paraminfo', pi._paraminfo) - self.assertEqual(len(pi), 1 + len(pi.preloaded_modules)) + self.assertLength(pi, 1 + len(pi.preloaded_modules)) self.assertEqual(pi['revisions']['prefix'], 'rv') @@ -318,7 +317,7 @@ """Test requesting multiple modules in one fetch.""" site = self.get_site() pi = api.ParamInfo(site) - self.assertEqual(len(pi), 0) + self.assertIsEmpty(pi) pi.fetch(['info', 'revisions']) self.assertIn('query+info', pi._paraminfo) self.assertIn('query+revisions', pi._paraminfo) @@ -326,13 +325,13 @@ self.assertIn('main', pi._paraminfo) self.assertIn('paraminfo', pi._paraminfo) - self.assertEqual(len(pi), 2 + len(pi.preloaded_modules)) + self.assertLength(pi, 2 + len(pi.preloaded_modules)) def test_with_invalid_module(self): """Test requesting different kind of invalid modules.""" site = self.get_site() pi = api.ParamInfo(site) - self.assertEqual(len(pi), 0) + self.assertIsEmpty(pi) with patch.object(pywikibot, 'warning') as w: pi.fetch('foobar') @@ -345,7 +344,7 @@ self.assertIn('main', pi._paraminfo) self.assertIn('paraminfo', pi._paraminfo) - self.assertEqual(len(pi), len(pi.preloaded_modules)) + self.assertLength(pi, pi.preloaded_modules) def test_submodules(self): """Test another module apart from query having submodules.""" @@ -444,7 +443,7 @@ self.assertIn('main', pi._paraminfo) self.assertIn('paraminfo', pi._paraminfo) - self.assertEqual(len(pi), 1 + len(pi.preloaded_modules)) + self.assertLength(pi, 1 + len(pi.preloaded_modules)) self.assertIn('query+revisions', pi.prefix_map) @@ -458,13 +457,10 @@ pi = api.ParamInfo(site, modules_only_mode=True) pi.fetch(['info']) self.assertIn('query+info', pi._paraminfo) - self.assertIn('main', pi._paraminfo) self.assertIn('paraminfo', pi._paraminfo) - self.assertEqual(len(pi), - 1 + len(pi.preloaded_modules)) - + self.assertLength(pi, 1 + len(pi.preloaded_modules)) self.assertIn('query+revisions', pi.prefix_map) @@ -528,19 +524,19 @@ options['anon'] = True self.assertCountEqual(['anon'], options._enabled) self.assertEqual(set(), options._disabled) - self.assertEqual(1, len(options)) + self.assertLength(options, 1) self.assertEqual(['anon'], list(options)) self.assertEqual(['anon'], list(options.api_iter())) options['bot'] = False self.assertCountEqual(['anon'], options._enabled) self.assertCountEqual(['bot'], options._disabled) - self.assertEqual(2, len(options)) + self.assertLength(options, 2) self.assertEqual(['anon', 'bot'], list(options)) self.assertEqual(['anon', '!bot'], list(options.api_iter())) options.clear() self.assertEqual(set(), options._enabled) self.assertEqual(set(), options._disabled) - self.assertEqual(0, len(options)) + self.assertIsEmpty(options) self.assertEqual([], list(options)) self.assertEqual([], list(options.api_iter())) @@ -550,12 +546,12 @@ options['invalid_name'] = True options['anon'] = True self.assertIn('invalid_name', options._enabled) - self.assertEqual(2, len(options)) + self.assertLength(options, 2) self.assertRaises(KeyError, options._set_site, self.get_site(), 'recentchanges', 'show') - self.assertEqual(2, len(options)) + self.assertLength(options, 2) options._set_site(self.get_site(), 'recentchanges', 'show', True) - self.assertEqual(1, len(options)) + self.assertLength(options, 1) self.assertRaises(TypeError, options._set_site, self.get_site(), 'recentchanges', 'show') @@ -707,7 +703,7 @@ self.assertIn('pageid', pagedata) self.assertIn('lastrevid', pagedata) count += 1 - self.assertEqual(len(links), count) + self.assertLength(links, count) def test_one_continuation(self): """Test PropertyGenerator with prop 'revisions'.""" @@ -727,7 +723,7 @@ self.assertIn('revisions', pagedata) self.assertIn('revid', pagedata['revisions'][0]) count += 1 - self.assertEqual(len(links), count) + self.assertLength(links, count) def test_two_continuations(self): """Test PropertyGenerator with prop 'revisions' and 'coordinates'.""" @@ -747,7 +743,7 @@ self.assertIn('revisions', pagedata) self.assertIn('revid', pagedata['revisions'][0]) count += 1 - self.assertEqual(len(links), count) + self.assertLength(links, count) @allowed_failure def test_many_continuations_limited(self): @@ -776,7 +772,7 @@ self.assertIsInstance(pagedata, dict) self.assertIn('pageid', pagedata) count += 1 - self.assertEqual(len(links), count) + self.assertLength(links, count) # FIXME: AssertionError: 30 != 6150 @allowed_failure @@ -798,7 +794,7 @@ self.assertIsInstance(pagedata, dict) self.assertIn('pageid', pagedata) count += 1 - self.assertEqual(len(links), count) + self.assertLength(links, count) # FIXME: AssertionError: 30 != 11550 # FIXME: test disabled as it takes longer than 10 minutes @@ -819,7 +815,7 @@ self.assertIsInstance(pagedata, dict) self.assertIn('pageid', pagedata) count += 1 - self.assertEqual(len(links), count) + self.assertLength(links, count) class TestDryQueryGeneratorNamespaceParam(TestCase): diff --git a/tests/aspects.py b/tests/aspects.py index 71f14e6..ab2e966 100644 --- a/tests/aspects.py +++ b/tests/aspects.py @@ -22,6 +22,10 @@ import warnings from contextlib import contextmanager +try: + from collections.abc import Sized +except ImportError: # Python 2.7 + from collections import Sized import pywikibot @@ -102,19 +106,25 @@ def assertIsEmpty(self, seq, msg=None): """Check that the sequence is empty.""" + self.assertIsInstance( + seq, Sized, 'seq argument is not a Sized class containing __len__') if seq: msg = self._formatMessage(msg, '%s is not empty' % safe_repr(seq)) - raise self.failureException(msg) + self.fail(msg) def assertIsNotEmpty(self, seq, msg=None): """Check that the sequence is not empty.""" + self.assertIsInstance( + seq, Sized, 'seq argument is not a Sized class containing __len__') if not seq: msg = self._formatMessage(msg, '%s is empty' % safe_repr(seq)) - raise self.failureException(msg) + self.fail(msg) def assertLength(self, seq, other, msg=None): """Verify that a sequence expr has the length of other.""" # the other parameter may be given as a sequence too + self.assertIsInstance( + seq, Sized, 'seq argument is not a Sized class containing __len__') first_len = len(seq) try: second_len = len(other) @@ -124,7 +134,7 @@ if first_len != second_len: msg = self._formatMessage( msg, 'len(%s) != %s' % (safe_repr(seq), second_len)) - raise self.failureException(msg) + self.fail(msg) def _addUnexpectedSuccess(self, result): """Report and ignore.""" @@ -1651,7 +1661,7 @@ # deprecation message from the set. self.assertCountEqual(set(self.deprecation_messages), [self.deprecation_messages[0]]) - self.assertEqual(len(self.deprecation_messages), count) + self.assertLength(self.deprecation_messages, count) self._reset_messages() def assertNoDeprecation(self, msg=None): diff --git a/tests/compat2core_tests.py b/tests/compat2core_tests.py index a6986f4..122c8c0 100644 --- a/tests/compat2core_tests.py +++ b/tests/compat2core_tests.py @@ -23,14 +23,14 @@ def test_replacements(self): """Test compat2core replacements.""" for item in c2c.replacements: - self.assertEqual(len(item), 2) + self.assertLength(item, 2) self.assertIsInstance(item[0], StringTypes) self.assertIsInstance(item[1], StringTypes) def test_warnings(self): """Test compat2core warnings.""" for item in c2c.warnings: - self.assertEqual(len(item), 2) + self.assertLength(item, 2) self.assertIsInstance(item[0], StringTypes) self.assertIsInstance(item[1], StringTypes) diff --git a/tests/site_tests.py b/tests/site_tests.py index 0e012c4..b555258 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -2639,7 +2639,7 @@ """Test the site.loadrevisions() method with rollback.""" mainpage = self.get_mainpage() self.site.loadrevisions(mainpage, total=12, rollback=True, sysop=True) - self.assertGreater(len(mainpage._revisions), 0) + self.assertIsNotEmpty(mainpage._revisions) self.assertLessEqual(len(mainpage._revisions), 12) self.assertTrue(all(rev.rollbacktoken is not None for rev in mainpage._revisions.values())) -- To view, visit https://gerrit.wikimedia.org/r/509808 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic136f9a826b6f57df00b038524412887370c01a8 Gerrit-Change-Number: 509808 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Lokal Profil <andre.costa(a)wikimedia.se> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits May 2019