Pywikibot-commits April 2021

pywikibot-commits@lists.wikimedia.org

1 participants
138 discussions

[Gerrit] ...core[master]: [IMPR] Use the new DisambiguationRobot interface and options
by Xqt (Code Review) 03 Apr '21

03 Apr '21

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/668078 ) Change subject: [IMPR] Use the new DisambiguationRobot interface and options ...................................................................... [IMPR] Use the new DisambiguationRobot interface and options Change-Id: I13791107fa93bb0c1ca63b52abb1f1365cae2c52 --- M scripts/misspelling.py 1 file changed, 9 insertions(+), 20 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/scripts/misspelling.py b/scripts/misspelling.py index cefb7f8..30d88bf 100755 --- a/scripts/misspelling.py +++ b/scripts/misspelling.py @@ -31,7 +31,6 @@ import pywikibot from pywikibot import i18n, pagegenerators -from pywikibot.bot import SingleSiteBot from pywikibot.tools.formatter import color_format from scripts.solve_disambiguation import DisambiguationRobot as BaseDisambigBot @@ -50,29 +49,19 @@ """Spelling bot.""" - available_options = { - 'always': None, - 'start': None, - 'main': False, - } - misspelling_templates = { 'wikipedia:de': ('Falschschreibung', 'Obsolete Schreibung'), } - # Optional: if there is a category, one can use the -start - # parameter. + # Optional: if there is a category, one can use the -start parameter misspelling_categories = ('Q8644265', 'Q9195708') def __init__(self, **kwargs) -> None: """Initializer.""" - # handle options first; - # they are needed for DisambiguationRobot positional arguments - SingleSiteBot.__init__(self, **kwargs) - super().__init__(always=self.opt.always, alternatives=[], - getAlternatives=True, dnSkip=False, generator=None, - primary=False, main_only=self.opt.main, - **self.options) # save options + self.available_options.update({ + 'start': None, + }) + super().__init__(**kwargs) @property def generator(self) -> Generator[pywikibot.Page, None, None]: @@ -124,7 +113,7 @@ @return: True if alternate link was appended """ if page.isRedirectPage(): - self.alternatives.append(page.getRedirectTarget().title()) + self.opt.pos.append(page.getRedirectTarget().title()) return True sitename = page.site.sitename @@ -143,12 +132,12 @@ # misspelling is ambiguous, see for example: # https://de.wikipedia.org/wiki/Buthan for match in self.linkR.finditer(correct_spelling): - self.alternatives.append(match.group('title')) + self.opt.pos.append(match.group('title')) - if not self.alternatives: + if not self.opt.pos: # There were no links in the parameter, so there is # only one correct spelling. - self.alternatives.append(correct_spelling) + self.opt.pos.append(correct_spelling) return True return False -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/668078 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: I13791107fa93bb0c1ca63b52abb1f1365cae2c52 Gerrit-Change-Number: 668078 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: DannyS712 <dannys712.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-CC: Bharatkhatri <bharatkhatri351(a)gmail.com> Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] use keyword arguments with solve_disambiguation.py
by Xqt (Code Review) 03 Apr '21

03 Apr '21

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/668044 ) Change subject: [IMPR] use keyword arguments with solve_disambiguation.py ...................................................................... [IMPR] use keyword arguments with solve_disambiguation.py Also deprecate bot attributes in favour of 'opt' options settings Change-Id: I0590ded8382aab083e52e1c2dd8a13371cf712e6 --- M scripts/solve_disambiguation.py 1 file changed, 205 insertions(+), 48 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index b3c8428..91c3c17 100755 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -75,7 +75,7 @@ """ # -# (C) Pywikibot team, 2003-2020 +# (C) Pywikibot team, 2003-2021 # # Distributed under the terms of the MIT license. # @@ -95,7 +95,9 @@ from pywikibot.backports import List from pywikibot.bot import (HighlightContextOption, ListOption, OutputProxyOption, SingleSiteBot, StandardOption) -from pywikibot.tools import first_lower, first_upper +from pywikibot.tools import ( + deprecated, first_lower, first_upper, issue_deprecation_warning, +) from pywikibot.tools.formatter import SequenceOutputter # Disambiguation Needed template @@ -598,25 +600,180 @@ 'hu': 'Egyért-redir', } - def __init__(self, always, alternatives, getAlternatives, dnSkip, - generator, primary, main_only, first_only=False, minimum=0, - **kwargs) -> None: + # refer -help message for complete options documentation + disambig_options = { + 'always': None, # always perform the same action + 'pos': [], # add possibilities as alternative disambig + 'just': True, # just and only use the possibilities given with command + 'dnskip': False, # skip already marked links + 'primary': False, # primary topic disambig + 'main': False, # only use main namespace + 'first': False, # use first link only + 'min': 0, # minimum number of pages on a disambig + } + + # needed for argument cleanup + available_options = disambig_options + + def __init__(self, *args, **kwargs) -> None: """Initializer.""" + self._clean_args(args, kwargs) super().__init__(**kwargs) - self.always = always - self.alternatives = alternatives - self.getAlternatives = getAlternatives - self.dnSkip = dnSkip - if generator: - self.generator = generator - self.primary = primary self.ignores = set() - self.main_only = main_only - self.first_only = first_only - self.minimum = minimum self.summary = None self.dn_template_str = i18n.translate(self.site, dn_template) + def _clean_args(self, args, kwargs): + """Cleanup positional and keyword arguments. + + Replace positional arguments with keyword arguments. + Replace old keywords with new keywords which are given by + argument handling. + + This also fixes arguments which aren't currently used by + BaseDisambigBot abstract class but was introduced for the old + DisambiguationRobot to prevent multiple deprecation warnings. + """ + # New keys of positional arguments + keys = ('always', 'pos', 'just', 'dnskip', 'generator', 'primary', + 'main', 'first', 'min') + + # Keys mapping from old argument name to new keywords. + # The ordering of dics is not safe for Python < 3.7. Therefore + # we need a dict in addition to key above. + keymap = { + 'alternatives': 'pos', + 'getAlternatives': 'just', + 'dnSkip': 'dnskip', + 'main_only': 'main', + 'first_only': 'first', + 'minimum': 'min', + } + + # Replace positional arguments with keyword arguments + for i, arg in enumerate(args): + key = keys[i] + issue_deprecation_warning( + 'Positional argument {} ({})'.format(i + 1, arg), + 'keyword argument "{}={}"'.format(key, arg), + since='20210303') + if key in kwargs: + pywikibot.warning('{!r} is given as keyword argument {!r} ' + 'already; ignoring {!r}' + .format(key, arg, kwargs[key])) + else: + kwargs[key] = arg + + # replace old keywords to new + for key in list(kwargs): + if key in keymap: + newkey = keymap[key] + issue_deprecation_warning( + '{!r} argument of {}'.format(key, self.__class__.__name__), + repr(newkey), since='20210303') + kwargs[newkey] = kwargs.pop(key) + + # Expand available_options + # Currently scripts may have its own options set + added_keys = [] + for key in keys: + if key != 'generator': + if key not in self.available_options: + added_keys.append(key) + self.available_options[key] = self.disambig_options[key] + if added_keys: + pywikibot.warning("""\ +The following keys were added to available_options: +{options}. +Either add them to available_options setting of {classname} +bot class or use available_options.update() to use default settings from +DisambiguationRobot""".format(options=added_keys, + classname=self.__class__.__name__)) + + # Deprecated properties --------------------------------------- + + @property + @deprecated('opt.always', since='20210303', future_warning=True) + def always(self): # noqa: D102 + return self.opt.always + + @always.setter + @deprecated('opt.always', since='20210303', future_warning=True) + def always(self, value): + self.opt.always = value + + @property + @deprecated('opt.dnskip', since='20210303', future_warning=True) + def dnSkip(self): # noqa: D102 + return self.opt.dnskip + + @dnSkip.setter + @deprecated('opt.dnskip', since='20210303', future_warning=True) + def dnSkip(self, value): + self.opt.dnskip = value + + @property + @deprecated('opt.primary', since='20210303', future_warning=True) + def primary(self): # noqa: D102 + return self.opt.primary + + @primary.setter + @deprecated('opt.primary', since='20210303', future_warning=True) + def primary(self, value): + self.opt.primary = value + + @property + @deprecated('opt.main', since='20210303', future_warning=True) + def main_only(self): # noqa: D102 + return self.opt.main + + @main_only.setter + @deprecated('opt.main', since='20210303', future_warning=True) + def main_only(self, value): + self.opt.main = value + + @property + @deprecated('opt.first', since='20210303', future_warning=True) + def first_only(self): # noqa: D102 + return self.opt.first + + @first_only.setter + @deprecated('opt.first', since='20210303', future_warning=True) + def first_only(self, value): + self.opt.first = value + + @property + @deprecated('opt.min', since='20210303', future_warning=True) + def minimum(self): # noqa: D102 + return self.opt.min + + @minimum.setter + @deprecated('opt.min', since='20210303', future_warning=True) + def minimum(self, value): + self.opt.min = value + + @property + @deprecated('opt.pos', since='20210303', future_warning=True) + def alternatives(self): # noqa: D102 + return self.opt.pos + + @alternatives.setter + @deprecated('opt.pos', since='20210303', future_warning=True) + def alternatives(self, value): + self.opt.pos = value + + @property + @deprecated('opt.just', since='20210303', future_warning=True) + def getAlternatives(self): # noqa: D102 + return self.opt.just + + @getAlternatives.setter + @deprecated('opt.just', since='20210303', future_warning=True) + def getAlternatives(self, value): + self.opt.just = value + + # ------------------------------------------------------------- + def checkContents(self, text: str) -> Optional[str]: # noqa: N802 """ Check if the text matches any of the ignore regexes. @@ -633,13 +790,13 @@ return None def makeAlternativesUnique(self) -> None: # noqa: N802 - """Remove duplicate items from self.alternatives. + """Remove duplicate items from self.opt.pos. Preserve the order of alternatives. """ seen = set() - self.alternatives = [i for i in self.alternatives - if i not in seen and not seen.add(i)] + self.opt.pos = [i for i in self.opt.pos + if i not in seen and not seen.add(i)] def setup(self) -> None: """Compile regular expressions.""" @@ -750,7 +907,7 @@ pywikibot.output('{0} is a redirect to {1}' .format(ref_page.title(), disamb_page.title())) if disamb_page.isRedirectPage(): - target = self.alternatives[0] + target = self.opt.pos[0] if pywikibot.input_yn( 'Do you want to make redirect {0} point to {1}?' .format(ref_page.title(), target), @@ -771,7 +928,7 @@ automatic_quit=False) if choice == 'y': gen = ReferringPageGeneratorWithIgnore( - ref_page, self.primary, main_only=self.main_only + ref_page, self.opt.primary, main_only=self.opt.main ) gen = pagegenerators.PreloadingGenerator(gen) for ref_page2 in gen: @@ -842,7 +999,7 @@ context = 60 # check if there's a dn-template here already - if (self.dnSkip and self.dn_template_str + if (self.opt.dnskip and self.dn_template_str and self.dn_template_str[:-2] in text[ m.end():m.end() + len(self.dn_template_str) + 8]): continue @@ -854,8 +1011,8 @@ end=m.end()) context_option.before_question = True - options = [ListOption(self.alternatives, ''), - ListOption(self.alternatives, 'r'), + options = [ListOption(self.opt.pos, ''), + ListOption(self.opt.pos, 'r'), StandardOption('skip link', 's'), edit, StandardOption('next page', 'n'), @@ -874,16 +1031,16 @@ options += [ OutputProxyOption('list', 'l', - SequenceOutputter(self.alternatives)), + SequenceOutputter(self.opt.pos)), AddAlternativeOption('add new', 'a', - SequenceOutputter(self.alternatives))] + SequenceOutputter(self.opt.pos))] if edited: options += [StandardOption('save in this form', 'x')] # TODO: Output context on each question answer = pywikibot.input_choice('Option', options, - default=self.always, - force=bool(self.always)) + default=self.opt.always, + force=bool(self.opt.always)) if answer == 'x': assert edited, 'invalid option before editing' break @@ -900,7 +1057,7 @@ if answer == 'n': # skip this page - if self.primary: + if self.opt.primary: # If run with the -primary argument, skip this # occurrence next time. self.ignores.add(ref_page.title(as_url=True)) @@ -1019,13 +1176,13 @@ return 'done' def findAlternatives(self, page) -> bool: # noqa: N802 - """Extend self.alternatives using correctcap of disambPage.linkedPages. + """Extend self.opt.pos using correctcap of disambPage.linkedPages. @param page: the disambiguation page @type page: pywikibot.Page @return: True if everything goes fine, False otherwise """ - if page.isRedirectPage() and not self.primary: + if page.isRedirectPage() and not self.opt.primary: primary = i18n.translate(page.site, self.primary_redir_template) if primary: @@ -1042,7 +1199,7 @@ page2 = pywikibot.Page( pywikibot.Link(disambTitle, self.site)) links = page2.linkedPages() - if self.first_only: + if self.opt.first: links = self.firstize(page2, links) links = [correctcap(link, page2.get()) for link in links] @@ -1053,11 +1210,11 @@ links = [correctcap(link, page.get(get_redirect=True)) for link in links] - self.alternatives += links + self.opt.pos += links else: try: target = page.getRedirectTarget().title() - self.alternatives.append(target) + self.opt.pos.append(target) except pywikibot.NoPage: pywikibot.output('The specified page was not found.') user_input = pywikibot.input("""\ @@ -1066,15 +1223,15 @@ if user_input == '': self.quit() else: - self.alternatives.append(user_input) + self.opt.pos.append(user_input) except pywikibot.IsNotRedirectPage: pywikibot.output( 'The specified page is not a redirect. Skipping.') return False - elif self.getAlternatives: - # not page.isRedirectPage() or self.primary + elif self.opt.just: + # not page.isRedirectPage() or self.opt.primary try: - if self.primary: + if self.opt.primary: try: page2 = pywikibot.Page( pywikibot.Link( @@ -1082,7 +1239,7 @@ % page.title(), self.site)) links = page2.linkedPages() - if self.first_only: + if self.opt.first: links = self.firstize(page2, links) links = [correctcap(link, page2.get()) for link in links] @@ -1096,7 +1253,7 @@ else: try: links = page.linkedPages() - if self.first_only: + if self.opt.first: links = self.firstize(page, links) links = [correctcap(link, page.get()) for link in links] @@ -1106,7 +1263,7 @@ except pywikibot.IsRedirectPage: pywikibot.output('Page is a redirect, skipping.') return False - self.alternatives += links + self.opt.pos += links return True def setSummaryMessage(self, page, new_targets=None, unlink_counter=0, @@ -1182,7 +1339,7 @@ def treat(self, page) -> None: """Work on a single disambiguation page.""" self.primaryIgnoreManager = PrimaryIgnoreManager( - page, enabled=self.primary) + page, enabled=self.opt.primary) if not self.findAlternatives(page): return @@ -1191,16 +1348,16 @@ self.makeAlternativesUnique() # sort possible choices if config.sort_ignore_case: - self.alternatives.sort(key=lambda x: x.lower()) + self.opt.pos.sort(key=lambda x: x.lower()) else: - self.alternatives.sort() - SequenceOutputter(self.alternatives).output() + self.opt.pos.sort() + SequenceOutputter(self.opt.pos).output() gen = ReferringPageGeneratorWithIgnore( page, - self.primary, - minimum=self.minimum, - main_only=self.main_only + self.opt.primary, + minimum=self.opt.min, + main_only=self.opt.main ) gen = pagegenerators.PreloadingGenerator(gen) for ref_page in gen: @@ -1209,7 +1366,7 @@ break # next disambig # clear alternatives before working on next disambiguation page - self.alternatives = [] + self.opt.pos = [] def main(*args: Tuple[str, ...]) -> None: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/668044 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: I0590ded8382aab083e52e1c2dd8a13371cf712e6 Gerrit-Change-Number: 668044 Gerrit-PatchSet: 5 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: DannyS712 <dannys712.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-CC: JAn Dudík <jan.dudik(a)gmail.com> Gerrit-CC: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [cleanup] remove deprecated logentries.MoveEntry methods
by jenkins-bot (Code Review) 03 Apr '21

03 Apr '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/674569 ) Change subject: [cleanup] remove deprecated logentries.MoveEntry methods ...................................................................... [cleanup] remove deprecated logentries.MoveEntry methods new_ns and new_title are deprecated for 6 years and FutureWarning is thrown with 5.0.0 Change-Id: I4ef67797a152bd2ae21850db1e63f2c33830644f --- M pywikibot/logentries.py 1 file changed, 0 insertions(+), 10 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/logentries.py b/pywikibot/logentries.py index e6b922f..0d09a4d 100644 --- a/pywikibot/logentries.py +++ b/pywikibot/logentries.py @@ -290,11 +290,6 @@ _expected_type = 'move' - @deprecated('target_ns.id', since='20150518', future_warning=True) - def new_ns(self): - """Return namespace id of target page.""" - return self.target_ns.id - @property def target_ns(self): """Return namespace object of target page.""" @@ -303,11 +298,6 @@ if 'target_ns' in self._params else self._params['new_ns']] - @deprecated('target_page', since='20150518', future_warning=True) - def new_title(self): - """Return page object of the new title.""" - return self.target_page - @property def target_title(self): """Return the target title.""" -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/674569 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: I4ef67797a152bd2ae21850db1e63f2c33830644f Gerrit-Change-Number: 674569 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [doc] fix docstring
by jenkins-bot (Code Review) 03 Apr '21

03 Apr '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/676723 ) Change subject: [doc] fix docstring ...................................................................... [doc] fix docstring Change-Id: Icd4ddc8853464e79f574075d59cdc7eccd2cc979 --- M scripts/maintenance/cache.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/maintenance/cache.py b/scripts/maintenance/cache.py index f7f4212..08023cb 100755 --- a/scripts/maintenance/cache.py +++ b/scripts/maintenance/cache.py @@ -54,7 +54,7 @@ older_than_one_day(entry) recent(entry) - There are helper functions which can be part of a command: +There are helper functions which can be part of a command: older_than(entry, interval) newer_than(entry, interval) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/676723 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: Icd4ddc8853464e79f574075d59cdc7eccd2cc979 Gerrit-Change-Number: 676723 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: adding some exceptions (bloomberg.com and some Russian sites)
by jenkins-bot (Code Review) 03 Apr '21

03 Apr '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/675292 ) Change subject: adding some exceptions (bloomberg.com and some Russian sites) ...................................................................... adding some exceptions (bloomberg.com and some Russian sites) Change-Id: Ic6e7e7653e02cf953d812fff7cc58c47a185b094 --- M scripts/reflinks.py 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/reflinks.py b/scripts/reflinks.py index 205f5c8..559da2e 100755 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -144,6 +144,7 @@ 403[ ]forbidden |(404|page|file|information|resource).*not([ ]*be)?[ ]* (available|found) + |are[ ]robot |site.*disabled |error[ ]404 |error.+not[ ]found @@ -170,7 +171,7 @@ 'fr': '.*(404|page|site).*en +travaux.*', 'es': '.*sitio.*no +disponible.*', 'it': '((pagina|sito) (non trovat[ao]|inesistente)|accedi|errore)', - 'ru': '.*(Страница|страница).*(не[ ]*найдена|отсутствует).*', + 'ru': '.*([Сс]траница.*(не[ ]*найдена|отсутствует)|Вы.*человек).*', } # Regex that match bare references -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/675292 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: Ic6e7e7653e02cf953d812fff7cc58c47a185b094 Gerrit-Change-Number: 675292 Gerrit-PatchSet: 3 Gerrit-Owner: Rubin <rubin.happy(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [doc] ignore submodules which are imported by __all__ already
by jenkins-bot (Code Review) 03 Apr '21

03 Apr '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/676714 ) Change subject: [doc] ignore submodules which are imported by __all__ already ...................................................................... [doc] ignore submodules which are imported by __all__ already Change-Id: I67291c75741480b3690fc03edab8155d1edf2678 --- M docs/api_ref/pywikibot.site.rst 1 file changed, 0 insertions(+), 58 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/api_ref/pywikibot.site.rst b/docs/api_ref/pywikibot.site.rst index 578f63a..04e0380 100644 --- a/docs/api_ref/pywikibot.site.rst +++ b/docs/api_ref/pywikibot.site.rst @@ -2,61 +2,3 @@ ======================= .. automodule:: pywikibot.site - -Submodules ----------- - -pywikibot.site.\_apisite module -------------------------------- - -.. automodule:: pywikibot.site._apisite - -pywikibot.site.\_basesite module --------------------------------- - -.. automodule:: pywikibot.site._basesite - -pywikibot.site.\_datasite module --------------------------------- - -.. automodule:: pywikibot.site._datasite - -pywikibot.site.\_decorators module ----------------------------------- - -.. automodule:: pywikibot.site._decorators - -pywikibot.site.\_extensions module ----------------------------------- - -.. automodule:: pywikibot.site._extensions - -pywikibot.site.\_generators module ----------------------------------- - -.. automodule:: pywikibot.site._generators - -pywikibot.site.\_interwikimap module ------------------------------------- - -.. automodule:: pywikibot.site._interwikimap - -pywikibot.site.\_namespace module ---------------------------------- - -.. automodule:: pywikibot.site._namespace - -pywikibot.site.\_obsoletesites module -------------------------------------- - -.. automodule:: pywikibot.site._obsoletesites - -pywikibot.site.\_siteinfo module --------------------------------- - -.. automodule:: pywikibot.site._siteinfo - -pywikibot.site.\_tokenwallet module ------------------------------------ - -.. automodule:: pywikibot.site._tokenwallet -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/676714 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: I67291c75741480b3690fc03edab8155d1edf2678 Gerrit-Change-Number: 676714 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [sphinx] ignore deprecated methods
by Xqt (Code Review) 03 Apr '21

03 Apr '21

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/676712 ) Change subject: [sphinx] ignore deprecated methods ...................................................................... [sphinx] ignore deprecated methods Change-Id: Iddd7096bc382205a4b74fadc30d2515661d40cbe --- M docs/conf.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/docs/conf.py b/docs/conf.py index bbc1bb4..075f718 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -456,7 +456,7 @@ if name.startswith('__') and name.endswith('__'): return True if obj.__doc__ is not None \ - and obj.__doc__.startswith(('DEPRECATED', 'Deprecated')): + and ('DEPRECATED' in obj.__doc__ or 'Deprecated' in obj.__doc__): return True return skip or name in exclusions -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/676712 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: Iddd7096bc382205a4b74fadc30d2515661d40cbe Gerrit-Change-Number: 676712 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [doc] Skip empty __init__
by jenkins-bot (Code Review) 03 Apr '21

03 Apr '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/676711 ) Change subject: [doc] Skip empty __init__ ...................................................................... [doc] Skip empty __init__ Change-Id: If8cd57dda4b24ade071947f3bca1d0f7359450ab --- M docs/conf.py M pywikibot/site/_apisite.py 2 files changed, 3 insertions(+), 4 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/conf.py b/docs/conf.py index e4be68c..bbc1bb4 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -451,7 +451,7 @@ """Skip certain members from documentation.""" inclusions = ('__init__', ) exclusions = () - if name in inclusions: + if name in inclusions and len(str.splitlines(obj.__doc__ or '')) >= 3: return False if name.startswith('__') and name.endswith('__'): return True diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py index f9233c9..951530e 100644 --- a/pywikibot/site/_apisite.py +++ b/pywikibot/site/_apisite.py @@ -102,10 +102,9 @@ WikibaseClientMixin, ): - """ - API interface to MediaWiki site. + """API interface to MediaWiki site. - Do not instantiate directly; use pywikibot.Site function. + Do not instantiate directly; use L{pywikibot.Site} function. """ @remove_last_args(['sysop']) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/676711 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: If8cd57dda4b24ade071947f3bca1d0f7359450ab Gerrit-Change-Number: 676711 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [soc] ignore magic methods from doc
by jenkins-bot (Code Review) 03 Apr '21

03 Apr '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/676710 ) Change subject: [soc] ignore magic methods from doc ...................................................................... [soc] ignore magic methods from doc Change-Id: I975c3d78aa0f171ebc4838916d96f639cf85cc00 --- M docs/conf.py 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/conf.py b/docs/conf.py index f237685..e4be68c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -450,9 +450,11 @@ def pywikibot_skip_members(app, what, name, obj, skip, options): """Skip certain members from documentation.""" inclusions = ('__init__', ) - exclusions = ('__dict__', '__weakref__',) + exclusions = () if name in inclusions: return False + if name.startswith('__') and name.endswith('__'): + return True if obj.__doc__ is not None \ and obj.__doc__.startswith(('DEPRECATED', 'Deprecated')): return True -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/676710 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: I975c3d78aa0f171ebc4838916d96f639cf85cc00 Gerrit-Change-Number: 676710 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: Fix spelling mistake
by jenkins-bot (Code Review) 03 Apr '21

03 Apr '21

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/676709 ) Change subject: Fix spelling mistake ...................................................................... Fix spelling mistake Change-Id: I0091ee9a37b788e22b93de3c90a3ec3b1732fa9d --- M scripts/__init__.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/__init__.py b/scripts/__init__.py index 0b5b23a..9ec9e7c 100644 --- a/scripts/__init__.py +++ b/scripts/__init__.py @@ -8,7 +8,7 @@ Every script provides a ``-help`` option which shows all available -options, their explanation and usage examples. Global optiond will be +options, their explanation and usage examples. Global options will be shown by ``-help:global`` or using:: python pwb.py -help -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/676709 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: I0091ee9a37b788e22b93de3c90a3ec3b1732fa9d Gerrit-Change-Number: 676709 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits April 2021