Pywikibot-commits

pywikibot-commits@lists.wikimedia.org

13500 discussions

[Gerrit] ...core[master]: [IMPR] refactor movepages.py
by jenkins-bot (Code Review) 21 Aug '22

21 Aug '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/822740 ) Change subject: [IMPR] refactor movepages.py ...................................................................... [IMPR] refactor movepages.py Refactor movepages.treat_page() function. Change-Id: Ifff0eb55379d7933d06f79b577fc9f78c5748901 --- M scripts/movepages.py 1 file changed, 99 insertions(+), 70 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/movepages.py b/scripts/movepages.py index 5f6198c..3be9e3f 100755 --- a/scripts/movepages.py +++ b/scripts/movepages.py @@ -38,6 +38,7 @@ # Distributed under the terms of the MIT license. # import re +from functools import partial from itertools import zip_longest import pywikibot @@ -71,9 +72,7 @@ def __init__(self, **kwargs) -> None: """Initializer.""" super().__init__(**kwargs) - self.appendAll = False - self.regexAll = False - self.noNamespace = False + self.create_title = None def move_one(self, page, new_page_tite) -> None: """Move one page to new_page_tite.""" @@ -99,84 +98,114 @@ return True return super().skip_page(page) - def treat_page(self) -> None: - """Treat a single page.""" - page = self.current_page - pagetitle = page.title(with_ns=False) - namesp = page.site.namespace(page.namespace()) + @staticmethod + def _select_action(page): + """Manage interactive choices.""" - if self.appendAll: - new_page_tite = '{}{}{}'.format(self.pagestart, pagetitle, - self.pageend) - if not self.noNamespace and namesp: - new_page_tite = '{}:{}'.format(namesp, new_page_tite) - elif self.regexAll: - new_page_tite = self.regex.sub(self.replacePattern, pagetitle) - if not self.noNamespace and namesp: - new_page_tite = '{}:{}'.format(namesp, new_page_tite) - if self.opt.prefix: - new_page_tite = '{}{}'.format(self.opt.prefix, pagetitle) - if self.opt.prefix or self.appendAll or self.regexAll: - if self.user_confirm('Change the page title to {!r}?' - .format(new_page_tite)): - self.move_one(page, new_page_tite) - return + def create_new_title_change(page, new_title=None): + """Change helper function.""" + if new_title is None: + return pywikibot.input('New page name:') + return new_title - # else: + def create_new_title_append(start, end, page, namespace=None): + """Append helper function.""" + page_title = page.title(with_ns=False) + new_page_tite = '{}{}{}'.format(start, page_title, end) + if namespace is not None: + new_page_tite = '{}:{}'.format(namespace, new_page_tite) + return new_page_tite + + def create_new_title_regex(regex, replacement, page, namespace=None): + """Replace helper function.""" + page_title = page.title(with_ns=False) + new_page_title = regex.sub(replacement, page_title) + if namespace is not None: + new_page_title = '{}:{}'.format(namespace, new_page_title) + return new_page_title + + def manage_namespace(page): + """Manage interactive choices for namespace prefix.""" + namespace = page.site.namespace(page.namespace()) + q = pywikibot.input_yn('Do you want to remove the ' + 'namespace prefix "{}:"?'.format(namespace), + automatic_quit=False) + return None if q else namespace + choice = pywikibot.input_choice('What do you want to do?', [('change page name', 'c'), ('append to page name', 'a'), ('use a regular expression', 'r'), ('next page', 'n')]) if choice == 'c': - new_page_tite = pywikibot.input('New page name:') - self.move_one(page, new_page_tite) + handler = partial(create_new_title_change, + new_title=create_new_title_change(page)) + choices = [('yes', 'y'), ('no', 'n')] elif choice == 'a': - self.pagestart = pywikibot.input('Append this to the start:') - self.pageend = pywikibot.input('Append this to the end:') - new_page_tite = ('{}{}{}'.format(self.pagestart, pagetitle, - self.pageend)) - if namesp: - if pywikibot.input_yn('Do you want to remove the ' - 'namespace prefix "{}:"?'.format(namesp), - automatic_quit=False): - self.noNamespace = True - else: - new_page_tite = ('{}:{}'.format(namesp, new_page_tite)) - choice2 = pywikibot.input_choice( - 'Change the page title to {!r}?'.format(new_page_tite), - [('yes', 'y'), ('no', 'n'), ('all', 'a')]) - if choice2 == 'y': - self.move_one(page, new_page_tite) - elif choice2 == 'a': - self.appendAll = True - self.move_one(page, new_page_tite) + start = pywikibot.input('Append this to the start:') + end = pywikibot.input('Append this to the end:') + ns = manage_namespace(page) + + handler = partial(create_new_title_append, + start, end, namespace=ns) + choices = [('yes', 'y'), ('no', 'n'), ('all', 'a')] elif choice == 'r': search_pattern = pywikibot.input('Enter the search pattern:') - self.replacePattern = pywikibot.input( - 'Enter the replace pattern:') - self.regex = re.compile(search_pattern) - if page.title() == page.title(with_ns=False): - new_page_tite = self.regex.sub(self.replacePattern, - page.title()) + regex = re.compile(search_pattern) + replacement = pywikibot.input('Enter the replace pattern:') + ns = manage_namespace(page) + + handler = partial(create_new_title_regex, + regex, replacement, namespace=ns) + choices = [('yes', 'y'), ('no', 'n'), ('all', 'a')] + else: + handler = None + choices = [] + + return handler, choices + + def _title_creator(self, page, prefix): + """Create function to generate new title.""" + + def create_new_title_prefix(prefix, page): + """Replace prefix helper function.""" + page_title = page.title(with_ns=False) + return '{}{}'.format(prefix, page_title) + + if prefix: + handler = partial(create_new_title_prefix, prefix) + choices = [('yes', 'y'), ('no', 'n'), ('all', 'a')] + else: + handler, choices = self._select_action(page) + + return choices, handler + + def treat_page(self) -> None: + """Treat a single page.""" + page = self.current_page + + if not self.opt.always: + choices, create_title = self._title_creator(page, self.opt.prefix) + + if create_title is None: + return + + self.create_title = create_title + + choice = pywikibot.input_choice( + 'Change the page title ' + 'to {!r}?'.format(create_title(page)), + choices) + + if choice == 'y': + pass + elif choice == 'a': + self.opt.always = True else: - if pywikibot.input_yn('Do you want to remove the ' - 'namespace prefix "{}:"?'.format(namesp), - automatic_quit=False): - new_page_tite = self.regex.sub( - self.replacePattern, page.title(with_ns=False)) - self.noNamespace = True - else: - new_page_tite = self.regex.sub(self.replacePattern, - page.title()) - choice2 = pywikibot.input_choice( - 'Change the page title to {!r}?'.format(new_page_tite), - [('yes', 'y'), ('no', 'n'), ('all', 'a')]) - if choice2 == 'y': - self.move_one(page, new_page_tite) - elif choice2 == 'a': - self.regexAll = True - self.move_one(page, new_page_tite) + return + + new_page_title = self.create_title(page) + self.move_one(page, new_page_title) def main(*args: str) -> None: @@ -220,7 +249,7 @@ if old_name: pywikibot.warning('-from:{} without -to:'.format(old_name)) old_name = value - elif opt == 'to:': + elif opt == 'to': if old_name: from_to_pairs.append([old_name, value]) old_name = None -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/822740 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: Ifff0eb55379d7933d06f79b577fc9f78c5748901 Gerrit-Change-Number: 822740 Gerrit-PatchSet: 3 Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [style] Fix some code style issues in dataextend.py
by jenkins-bot (Code Review) 21 Aug '22

21 Aug '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/824882 ) Change subject: [style] Fix some code style issues in dataextend.py ...................................................................... [style] Fix some code style issues in dataextend.py Change-Id: Id4e77223b6237c4d6ec2b500ca583e66a02875df --- M scripts/dataextend.py 1 file changed, 180 insertions(+), 88 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/dataextend.py b/scripts/dataextend.py index 816628f..d518996 100644 --- a/scripts/dataextend.py +++ b/scripts/dataextend.py @@ -2604,8 +2604,7 @@ result = self.findbyre(r'>{}\|([^<>]+)'.format(name), html) if result: return result.replace(' ', '') - else: - return None + return None def findlanguagenames(self, html): languagenames = set() @@ -2638,15 +2637,13 @@ section = self.findbyre(r'<ns1:nationalityOfEntity>(.*?)</ns1:nationalityOfEntity>', html) if section: return self.findallbyre(r'<ns1:text>([^<>]+)</ns1:text>', section, 'country') - else: - return None + return None def findlanguagesspoken(self, html): section = self.findbyre(r'<ns1:languageOfEntity>(.*?)</ns1:languageOfEntity>', html) if section: return self.findallbyre(r'<ns1:text>([^<>]+)</ns1:text>', section, 'language') - else: - return None + return None def findoccupations(self, html): sections = self.findallbyre(r'<ns1:occupation>(.*?)</ns1:occupation>', html) @@ -2976,9 +2973,12 @@ result = self.findbyre(r'<li><h3>Birth Date</h3><ul[^<>]*>(\d{8})<', html) if result: return '{}-{}-{}'.format(result[6:], result[4:6], result[:4]) - result = self.findbyre(r'(?s)Birth Date</h3><.*?>(?:$.*?$)?([^<>]*?)</ul>', html) or \ - self.findbyre(r'[\s$]b\.\s+([\w\-/]+)', html) or \ - self.findbyre(r'skos:prefLabel">[^<>]*, (\d+)-', html) + + result = ( + self.findbyre(r'(?s)Birth Date</h3><.*?>(?:\(.*?$)?([^<>]*?)</ul>', html) + or self.findbyre(r'[\s$]b\.\s+([\w\-/]+)', html) + or self.findbyre(r'skos:prefLabel">[^<>]*, (\d+)-', html) + ) if result and '[' not in result: m = re.match(r'(\d+)[/\-](\d+)[/\-](\d+)', result) if m: @@ -2989,12 +2989,17 @@ ) return result + return None + def finddeathdate(self, html): result = self.findbyre(r'<li><h3>Death Date</h3><ul[^<>]*>(\d{8})<', html) if result: return '{}-{}-{}'.format(result[6:], result[4:6], result[:4]) - result = self.findbyre(r'(?s)Death Date</h3><.*?>(?:\(.*?$)?([^<>]*?)</ul>', html) or \ - self.findbyre(r'skos:prefLabel">[^<>]*, \d+-(\d+)', html) + + result = ( + self.findbyre(r'(?s)Death Date</h3><.*?>(?:$.*?$)?([^<>]*?)</ul>', html) + or self.findbyre(r'skos:prefLabel">[^<>]*, \d+-(\d+)', html) + ) if result and '[' not in result: m = re.match(r'(\d+)[/\-](\d+)[/\-](\d+)', result) if m: @@ -3005,6 +3010,8 @@ ) return result + return None + def findbirthplace(self, html): return self.findbyre( r'(?s)Birth Place</h3><.*?>(?:$[^<>]*$)?([^<>]+)\s*(?:$[^<>]*$)?\s*</?[au]', html, 'city') @@ -3042,11 +3049,15 @@ result += self.findallbyre(r'>([^<>]+)</a', section, 'language') return result + return None + def findworkfields(self, html): section = self.findbyre(r'(?s)Field of Activity</h3>.*?(<ul.*?</ul>)', html) if section: return self.findallbyre(r'>([^<>]+)</a', section, 'subject') + return None + def findmixedrefs(self, html): return self.finddefaultmixedrefs(html, includesocial=False) @@ -3346,8 +3357,10 @@ def findnames(self, html): section = self.findbyre(r'(?s)<h1[^<>]>(.*?)</h1>', html) or '' - return self.findallbyre(r'(?s)<span>(.*?)(?:, b\. \d+)?\s*</span>', section) +\ - self.findallbyre(r'"seefm">(.*?)(?:, b\. \d+)?\s*[<\(（]', html) + return ( + self.findallbyre(r'(?s)<span>(.*?)(?:, b\. \d+)?\s*</span>', section) + + self.findallbyre(r'"seefm">(.*?)(?:, b\. \d+)?\s*[<\(（]', html) + ) def findinstanceof(self, html): return 'Q5' @@ -6271,8 +6284,10 @@ result = [] for section in sections: result += self.findallbyre(r'(?s)<li>(.*?)<', section) - return self.findallbyre(r'<span class="name">(.*?)<', html) + result + \ - self.findallbyre(r'(/s)<dt>\s*Name\s*</dt>\s*<dd>(.*?)<', html) + return ( + self.findallbyre(r'<span class="name">(.*?)<', html) + result + + self.findallbyre(r'(/s)<dt>\s*Name\s*</dt>\s*<dd>(.*?)<', html) + ) def findlongtext(self, html): return self.findbyre(r'(?s)<div class="summary">(.*?)</div>', html) @@ -6935,10 +6950,14 @@ def findbirthdate(self, html): result = self.findbyre(r'born on (\d+\w{2} of \w+ \d{4})', html) if result: - return self.findbyre(r'(\d+)', result) + self.findbyre(r'of( .*)', result) - return self.findbyre(r'born on (\w+ \w+ \w+)', html) or \ - self.findbyre(r'Born\s*:?\s*(\d+ \w+ \d+)', html) or \ - self.findbyre(r'Born\s*:?\s*(\w+ \d+, \d+)', html) + return self.findbyre(r'(\d+)', result) + self.findbyre(r'of( .*)', + result) + + return ( + self.findbyre(r'born on (\w+ \w+ \w+)', html) + or self.findbyre(r'Born\s*:?\s*(\d+ \w+ \d+)', html) + or self.findbyre(r'Born\s*:?\s*(\w+ \d+, \d+)', html) + ) def findbirthplace(self, html): return self.findbyre(r'[bB]orn (?:on|:) .*? in ([\w\s]+)', html, 'city') @@ -8314,6 +8333,8 @@ if section: return self.findbyre(r'$(.*?)$', section) + return None + def findweights(self, html): section = self.getvalue('Weight', html) if section: @@ -8321,6 +8342,7 @@ self.findbyre(r'(\d+ lbs)', section), self.findbyre(r'(\d+ kg)', section) ] + return None def findsports(self, html): return self.getvalues('Background in sports', html) @@ -8330,8 +8352,9 @@ def findoccupations(self, html): preoccs = self.getvalues('Roles', html) - return [self.findbyre(r'([^]+)', preocc or '', 'occupation') for preocc in preoccs] \ - + self.getvalues('Active Roles', html, 'occupation') + return [self.findbyre(r'([^]+)', preocc or '', 'occupation') + for preocc in preoccs] + self.getvalues('Active Roles', html, + 'occupation') class PerseeAnalyzer(Analyzer): @@ -10372,15 +10395,19 @@ result = self.findallbyre(r'(?s)>(.*?)<', section) else: result = [] - return result + \ - self.findallbyre(r'title" content="(.*?)[\|"]', html) + \ - self.findallbyre(r'(?s)<title>(.*?)[\|"]', html) + return ( + result + + self.findallbyre(r'title" content="(.*?)[\|"]', html) + + self.findallbyre(r'(?s)<title>(.*?)[\|"]', html) + ) def findlongtext(self, html): - return self.findbyre(r'(?s)<h2[^<>]*>\s*Biografia\s*</h2>(.*?)<h\d', html) + return self.findbyre( + r'(?s)<h2[^<>]*>\s*Biografia\s*</h2>(.*?)<h\d', html) def findoccupations(self, html): - section = self.findbyre(r'(?s)>\s*Habilidades\s*<.*?<ul>(.*?)</ul>', html) + section = self.findbyre( + r'(?s)>\s*Habilidades\s*<.*?<ul>(.*?)</ul>', html) if section: return self.findallbyre(r'(?s)>(.*?)<', section, 'occupation') @@ -10388,16 +10415,19 @@ return self.findallbyre(r'(?s)mãe de\s*<.*?>(.*?)<', html, 'person') def findbirthdate(self, html): - return self.findbyre(r'(?s)>Data de nascimento[^<>]*</span>(.*?)<', html) + return self.findbyre( + r'(?s)>Data de nascimento[^<>]*</span>(.*?)<', html) def findbirthplace(self, html): - return self.findbyre(r'(?s)>Local de nascimento[^<>]*</span>(.*?)<', html, 'city') + return self.findbyre( + r'(?s)>Local de nascimento[^<>]*</span>(.*?)<', html, 'city') def finddeathdate(self, html): return self.findbyre(r'(?s)>Data de morte[^<>]*</span>(.*?)<', html) def finddeathplace(self, html): - return self.findbyre(r'(?s)>Local de morte[^<>]*</span>(.*?)<', html, 'city') + return self.findbyre( + r'(?s)>Local de morte[^<>]*</span>(.*?)<', html, 'city') class AKLAnalyzer(Analyzer): @@ -10416,7 +10446,8 @@ return [self.findbyre(r'"pf:contentName"\s*:\s*"(.*?)"', html)] def finddescription(self, html): - return self.findbyre('<b>Beruf</b>.*?<dd class="fieldValue">(.*?)<', html) + return self.findbyre( + '<b>Beruf</b>.*?<dd class="fieldValue">(.*?)<', html) def findoccupations(self, html): section = self.findbyre('<b>Beruf</b>.*?<dd class="fieldValue">(.*?)<', html) @@ -10430,7 +10461,8 @@ return self.findbyre(r'"pf:contentName"\s*:\s*"([^"]*?),', html) def findbirthdate(self, html): - return self.findbyre(r'<b>Beruf</b>.*?<dd class="fieldValue">([\d\.]+)', html) + return self.findbyre( + r'<b>Beruf</b>.*?<dd class="fieldValue">([\d\.]+)', html) class SpanishBiographyAnalyzer(Analyzer): @@ -10443,40 +10475,55 @@ self.language = 'es' def finddescription(self, html): - return self.findbyre(r'(?:<span style="font-family:\'Times New Roman\';">|</b>)\.?(.*?)<', html) + return self.findbyre( + r'(?:<span style="font-family:\'Times New Roman\';">|</b>)\.?(.*?)<', html) def findnames(self, html): return [self.findbyre(r'"twitter:title" content="(.*?)"', html)] def findlongtext(self, html): - return self.findbyre(r'(?s)<div class="field--label[^<>]*">Biograf.a</div>(.*?)</div>', html) + return self.findbyre( + r'(?s)<div class="field--label[^<>]*">Biograf.a</div>(.*?)</div>', + html) def findinstanceof(self, html): return 'Q5' def findbirthdate(self, html): - return self.findbyre(r'"description" content="[^"]+$([^"]*?)–', html) or \ - self.findbyre(r'(?:<span style="font-family:\'Times New Roman\';">|</b>)[^<>]*?((?:\d+\.\w+\.)?\d+) –', - html) + return ( + self.findbyre(r'"description" content="[^"]+\(([^"]*?)–', html) + or self.findbyre( + r'(?:<span style="font-family:\'Times New Roman\';">|</b>)[^<>]*?((?:\d+\.\w+\.)?\d+) –', + html) + ) def finddeathdate(self, html): - return self.findbyre(r'"description" content="[^"]+–([^"]*?)$', html) or \ - self.findbyre( - r'(?:<span style="font-family:\'Times New Roman\';">|</b>)[^<>]*? – [^<>]*?((?:\d+\.\w+\.)?\d+)', - html) + return ( + self.findbyre(r'"description" content="[^"]+–([^"]*?)\)', html) + or self.findbyre( + r'(?:<span style="font-family:\'Times New Roman\';">|</b>)[^<>]*? – [^<>]*?((?:\d+\.\w+\.)?\d+)', + html) + ) def findbirthplace(self, html): - return self.findbyre(r'(?:<span style="font-family:\'Times New Roman\';">|</b>)\.?([^<>–,]*),', html, 'city') + return self.findbyre( + r'(?:<span style="font-family:\'Times New Roman\';">|</b>)\.?([^<>–,]*),', + html, 'city') def finddeathplace(self, html): - return self.findbyre(r'(?:<span style="font-family:\'Times New Roman\';">|</b>)[^<>]*?– ([^<>]*?),', html, - 'city') + return self.findbyre( + r'(?:<span style="font-family:\'Times New Roman\';">|</b>)[^<>]*?– ([^<>]*?),', + html, 'city') def findoccupations(self, html): - section = self.findbyre(r'(?:<span style="font-family:\'Times New Roman\';">|</b>)[^<>]+\.([^<>]+)', html) + section = self.findbyre( + r'(?:<span style="font-family:\'Times New Roman\';">|</b>)[^<>]+\.([^<>]+)', + html) if section: return self.findallbyre(r'([\s\w]+)', section, 'occupation') + return None + class CommonwealthGamesAnalyzer(Analyzer): def setup(self): @@ -10488,9 +10535,11 @@ self.language = 'en' def findnames(self, html): - return self.findallbyre(r'name" content="(.*?)"', html) + \ - self.findallbyre(r'<title>(.*?)[\|<]', html) + \ - self.findallbyre(r'<h\d[^<>]*>(.*?)<', html) + return ( + self.findallbyre(r'name" content="(.*?)"', html) + + self.findallbyre(r'<title>(.*?)[\|<]', html) + + self.findallbyre(r'<h\d[^<>]*>(.*?)<', html) + ) def findinstanceof(self, html): return 'Q5' @@ -10499,7 +10548,8 @@ return self.findallbyre(r'"Country"><[^<>]*>(.*?)<', html, 'country') def findparticipations(self, html): - return self.findallbyre(r'"Games"><[^<>]*>(.*?)<', html, 'commonwealth-games') + return self.findallbyre( + r'"Games"><[^<>]*>(.*?)<', html, 'commonwealth-games') def findsports(self, html): return self.findallbyre(r'"Event"><[^<>]*>([^<>]*?)-', html, 'sport') @@ -10530,19 +10580,27 @@ return self.findbyre('>([^<>]+)', self.findlongtext(html)) def findbirthplace(self, html): - return self.findbyre(r'(?s)<span class="etichetta">Esistenza</span>\s*<span class="campo">(.*?) [\d—]', html, 'city') + return self.findbyre( + r'(?s)<span class="etichetta">Esistenza</span>\s*<span class="campo">(.*?) [\d—]', + html, 'city') def findbirthdate(self, html): - return self.findbyre(r'(?s)<span class="etichetta">Esistenza</span>\s*<span class="campo">[^<>]*? (\d[\w\d\s]*)—', html) + return self.findbyre( + r'(?s)<span class="etichetta">Esistenza</span>\s*<span class="campo">[^<>]*? (\d[\w\d\s]*)—', + html) def finddeathplace(self, html): - return self.findbyre(r'(?s)<span class="etichetta">Esistenza</span>\s*<span class="campo">[^<>]*—(.*?) [\d<]', html, 'city') + return self.findbyre( + r'(?s)<span class="etichetta">Esistenza</span>\s*<span class="campo">[^<>]*—(.*?) [\d<]', + html, 'city') def finddeathdate(self, html): return self.findbyre(r'(?s)<span class="etichetta">Esistenza</span>\s*<span class="campo">[^<>]*—[^<>]*? (\d[\w\d\s]*)<', html) def findoccupations(self, html): - section = self.findbyre(r'(?s)<span class="etichetta">Nota biografica</span>\s*<span class="campo">(.*?)<', html) + section = self.findbyre( + r'(?s)<span class="etichetta">Nota biografica</span>\s*<span class="campo">(.*?)<', + html) if section: result = [] parts = section.split(' e ') @@ -10550,6 +10608,8 @@ result += self.findallbyre(r'([\w\s]+)', part, 'occupation') return result + return None + def findmemberships(self, html): return ['Q338489'] @@ -10570,16 +10630,19 @@ return [self.findbyre(r'<title>(.*?)[$\|<]', html)] def findfirstname(self, html): - return self.findbyre(r'<h3[^<>]*>[^<>]*\([^<>,]*?,\s*([\w\-]+)', html, 'firstname') + return self.findbyre( + r'<h3[^<>]*>[^<>]*\([^<>,]*?,\s*([\w\-]+)', html, 'firstname') def findlastname(self, html): - return self.findbyre(r'<h3[^<>]*>[^<>]*\(([^<>,]*?),', html, 'lastname') + return self.findbyre( + r'<h3[^<>]*>[^<>]*\(([^<>,]*?),', html, 'lastname') def findbirthdate(self, html): return self.findbyre(r'<h3[^<>]*>[^<>]*\([^<>]*,([^<>]*)-', html) def finddeathdate(self, html): - return self.findbyre(r'<h3[^<>]*>[^<>]*\([^<>]*,[^<>]*-([^<>]*)$', html) + return self.findbyre( + r'<h3[^<>]*>[^<>]*$[^<>]*,[^<>]*-([^<>]*)$', html) class NumbersAnalyzer(Analyzer): @@ -10625,7 +10688,8 @@ return self.findbyre(r'lbFirstName\d*">(.*?)<', html, 'firstname') def findlastname(self, html): - return self.findbyre(r'lbLastName\d*">(.*?)(?:,\s*)?<', html, 'lastname') + return self.findbyre( + r'lbLastName\d*">(.*?)(?:,\s*)?<', html, 'lastname') def findbirthdate(self, html): return self.findbyre(r'lblDate[oO]fBirth">(.*?)<', html) @@ -10652,10 +10716,13 @@ return self.findbyre(r'"description"[^<>]*content="(.*?)"', html) def findlongtext(self, html): - return self.findbyre(r'(?s)(<div class="detalii.block info.actor">.*?after.actor.biography -->)', html) + return self.findbyre( + r'(?s)(<div class="detalii.block info.actor">.*?after.actor.biography -->)', + html) def findbirthplace(self, html): - return self.findbyre(r'(?s)<b>Locul naşterii</b>:([^<>]*)', html, 'city') + return self.findbyre( + r'(?s)<b>Locul naşterii</b>:([^<>]*)', html, 'city') def findbirthdate(self, html): return self.findbyre(r'(?s)<b>Data naşterii</b>.*?>([^<>]*)</a>', html) @@ -10664,10 +10731,13 @@ with open('result.html', 'w') as f: f.write(html) - result = self.findallbyre(r'(?s)Filmografie - (.*?)<', html, 'film-occupation', alt=['occupation']) + result = self.findallbyre(r'(?s)Filmografie - (.*?)<', + html, 'film-occupation', alt=['occupation']) section = self.findbyre(r'(?s)<b>Ocupaţie</b>:([^<>]*)', html) if section: - result += self.findallbyre(r'([\w\s]+)', section, 'film-occupation', alt=['occupation']) + result += self.findallbyre(r'([\w\s]+)', + section, 'film-occupation', + alt=['occupation']) if 'title="Filme cu' in html: result += ['Q33999'] return result @@ -10703,7 +10773,8 @@ return self.findbyre(r'"flash">[^<>]*? - ([^<>]*?),', html, 'city') def finddeathdate(self, html): - return self.findbyre(r'"flash">[^<>]*? - (?:[^<>]*,)?([^<>,\-])*<', html) + return self.findbyre( + r'"flash">[^<>]*? - (?:[^<>]*,)?([^<>,\-])*<', html) def findincollections(self, html): section = self.findbyre(r'(?s)Collections</span>(.*?)</table>', html) @@ -10733,7 +10804,8 @@ return self.findbyre(r'itemprop="birthDate" datetime="(.*?)"', html) def findbirthplace(self, html): - return self.findbyre(r'itemprop="birthPlace".*?>(.*?)[\(<]', html, 'city') + return self.findbyre( + r'itemprop="birthPlace".*?>(.*?)[\(<]', html, 'city') def finddeathdate(self, html): return self.findbyre(r'itemprop="deathDate" datetime="(.*?)"', html) @@ -10960,9 +11032,11 @@ section = self.findallbyre(r'"alias":\[(.*?)\]', html) if section: result += self.findallbyre(r'"(.*?)"', section) + [self.findbyre(r'"displayName":"(.*?)"', html)] - result += self.findallbyre(r'"displayName":"(.*?)"', html) \ - + self.findallbyre(r'Alias(?:es)?:([^<>]*)', html) \ - + self.findallbyre(r'"name":"(.*?)"', html) + result += ( + self.findallbyre(r'"displayName":"(.*?)"', html) + + self.findallbyre(r'Alias(?:es)?:([^<>]*)', html) + + self.findallbyre(r'"name":"(.*?)"', html) + ) return result def findoccupations(self, html): @@ -13009,8 +13083,9 @@ return self.findbyre(r'<meta name="description"\s*content="(.*?)"', html, 'instanceof') def findnames(self, html): - return (self.findbyre('<dd itemprop="additionalName">(.*?)</dd>', html) or '').split(',') +\ - self.findallbyre(r'title"\d*content="(.*?)["|]', html) + return ( + self.findbyre('<dd itemprop="additionalName">(.*?)</dd>', html) + or '').split(',') + self.findallbyre(r'title"\d*content="(.*?)["|]', html) def findlongtext(self, html): return self.findbyre('(?s)itemprop="description">(.*?)</div>', html) @@ -13040,8 +13115,10 @@ def findnames(self, html): section = self.findbyre(r'(?s)(<h1.*?)<script>', html) or self.findbyre(r'(?s)(.*?)<script>', html) or html - return self.findallbyre(r'itemprop="\w*[nN]ame"[^<>]*>(.*?)<', section) + \ - self.findallbyre(r'itemprop="sameAs"[^<>]*>(.*?)<', section) + return ( + self.findallbyre(r'itemprop="\w*[nN]ame"[^<>]*>(.*?)<', section) + + self.findallbyre(r'itemprop="sameAs"[^<>]*>(.*?)<', section) + ) def findlongtext(self, html): return self.findbyre(r'(?s)(<h1.*?)<script>', html) @@ -13646,8 +13723,9 @@ def findwebpages(self, html): section = self.findbyre('(?s)<section id="otherInfoAF">(.*?)</section>', html) links = self.findallbyre('"(http[^<>]*?)"', section) - for text in ['wikipedia', 'id.loc.gov', 'd-nb.info', 'bnf.fr', 'getty.edu', 'viaf.org', - 'cerl.org', 'catholic-hierarchy', 'wikidata', 'treccani']: + for text in ['wikipedia', 'id.loc.gov', 'd-nb.info', 'bnf.fr', + 'getty.edu', 'viaf.org', 'cerl.org', 'catholic-hierarchy', + 'wikidata', 'treccani']: links = [link for link in links if text not in link] return links @@ -13668,8 +13746,10 @@ def findnames(self, html): section = self.getvalue('Namensvarianten', html) or '' - return self.findallbyre(r'<h1[^<>]*>(.*?)<', html) + \ - self.findallbyre(r'<li[^<>]*>(.*?)<', section) + return ( + self.findallbyre(r'<h1[^<>]*>(.*?)<', html) + + self.findallbyre(r'<li[^<>]*>(.*?)<', section) + ) def findlongtext(self, html): return self.findbyre(r'(?s)<h4[^<>]*>Leben(<.*?)</li>', html) @@ -14189,13 +14269,18 @@ templatetype = re.search('([^{|]*)', text).group(0).lower().strip() firstword = templatetype.split()[0] lastword = templatetype.split()[-1] - return templatetype in ['sourcetext', 'ref-llibre', 'article', 'lien web', 'مرجع ويب', 'écrit', - 'reflist'] or \ - firstword in ['citeer', 'cite', 'link', 'cita', 'cytuj', 'книга', 'citar', 'ouvrage', 'grafikus', - 'citation', 'citácia', 'erreferentzia', 'citace', 'lien'] or \ - lastword in ['source', 'स्रोत', '인용'] + return ( + templatetype in ['sourcetext', 'ref-llibre', 'article', 'lien web', + 'مرجع ويب', 'écrit', 'reflist'] + or firstword in ['citeer', 'cite', 'link', 'cita', 'cytuj', + 'книга', 'citar', 'ouvrage', 'grafikus', + 'citation', 'citácia', 'erreferentzia', 'citace', + 'lien'] + or lastword in ['source', 'स्रोत', '인용'] + ) - def getinfos(self, names, html, dtype=None, splitters='<>,;/،・{}|*', alt=None) -> list: + def getinfos(self, names, html, dtype=None, splitters='<>,;/،・{}|*', + alt=None) -> List[str]: if not alt: alt = [] if not splitters: @@ -14261,7 +14346,7 @@ for section in sections: result += self.findallbyre(r'([^,;]*)', section) return [ - self.id.replace('_', ' ').split('(')[0].split(':', 1)[-1]] + result + self.id.replace('_', ' ').split('(')[0].split(':', 1)[-1]] + result def findlanguagenames(self, html): values = self.findallbyre(r'{{lang[-\|](\w+\|.*?)}}', html.replace("'''", '')) @@ -14275,14 +14360,21 @@ templatetype = re.search('([^{|]+)', text).group(0).lower().strip() firstword = templatetype.split()[0] lastword = templatetype.split()[-1] - return templatetype in ['sourcetext', 's-bef', 's-ttl', 's-aft', 'appendix', 'familytree', 'ref-llibre', - 'sfn', 'obra citada', 'arbre généalogique', 'infobox chinese namen', - 'infobox tibetaanse namen', 'reflist', 'navedi splet', - 'article', 'הערה', 'مرجع ويب', 'écrit'] \ - or firstword in ['citeer', 'cite', 'ouvrage', 'link', 'grafikus', 'cita', 'cytuj', 'книга', 'citar', - 'ouvrage', 'citation', 'erreferentzia', 'lien', 'citace', 'citácia'] \ - or lastword in ['source', 'स्रोत', '인용'] \ - or templatetype.startswith('ahnentafel') + return ( + templatetype in ['sourcetext', 's-bef', 's-ttl', 's-aft', + 'appendix', 'familytree', 'ref-llibre', 'sfn', + 'obra citada', 'arbre généalogique', + 'infobox chinese namen', + 'infobox tibetaanse namen', 'reflist', + 'navedi splet', 'article', 'הערה', 'مرجع ويب', + 'écrit'] + or firstword in ['citeer', 'cite', 'ouvrage', 'link', 'grafikus', + 'cita', 'cytuj', 'книга', 'citar', 'ouvrage', + 'citation', 'erreferentzia', 'lien', 'citace', + 'citácia'] + or lastword in ['source', 'स्रोत', '인용'] + or templatetype.startswith('ahnentafel') + ) def findlongtext(self, html): changedhtml = html.strip() -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/824882 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: Id4e77223b6237c4d6ec2b500ca583e66a02875df Gerrit-Change-Number: 824882 Gerrit-PatchSet: 2 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]: [doc] Update some version hints
by jenkins-bot (Code Review) 21 Aug '22

21 Aug '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/824856 ) Change subject: [doc] Update some version hints ...................................................................... [doc] Update some version hints Change-Id: Idcebe4eba4ffcae5fe797ec57fae9cfaf1f60e61 --- M ROADMAP.rst M pywikibot/site/_generators.py M pywikibot/textlib.py 3 files changed, 11 insertions(+), 4 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/ROADMAP.rst b/ROADMAP.rst index 4a13866..2a9c1b8 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -7,6 +7,7 @@ Deprecations ^^^^^^^^^^^^ +* 7.6.0: :mod:`tools.itertools` datatypes should no longer imported from :mod:`pywikibot.tools` * 7.6.0: :mod:`tools.collections` datatypes should no longer imported from :mod:`pywikibot.tools` * 7.5.0: :mod:`pywikibot.textlib`.tzoneFixedOffset class will be removed in favour of :class:`pywikibot.time.TZoneFixedOffset` * 7.4.0: `FilePage.usingPages()` was renamed to :meth:`using_pages()<pywikibot.FilePage.using_pages>` diff --git a/pywikibot/site/_generators.py b/pywikibot/site/_generators.py index aad1b86..021ac70 100644 --- a/pywikibot/site/_generators.py +++ b/pywikibot/site/_generators.py @@ -101,6 +101,9 @@ Pages are iterated in the same order than in the underlying pagelist. In case of duplicates in a groupsize batch, return the first entry. + .. versionchanged:: 7.6 + ``content`` parameter was added. + :param pagelist: an iterable that returns Page objects :param groupsize: how many Pages to query at a time :param templates: preload pages (typically templates) transcluded in diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index d6eab05..f8e1675 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -1966,14 +1966,17 @@ return False return True - def timestripper(self, line): + def timestripper(self, line: str) -> Optional['pywikibot.Timestamp']: """ Find timestamp in line and convert it to time zone aware datetime. - All the following items must be matched, otherwise None is returned: - -. year, month, hour, time, day, minute, tzinfo + All the following items must be matched, otherwise None is + returned: -. year, month, hour, time, day, minute, tzinfo + + .. versionchanged:: 7.6 + HTML parts are removed from line + :return: A timestamp found on the given line - :rtype: pywikibot.Timestamp """ # Try to maintain gaps that are used in _valid_date_dict_positions() def censor_match(match): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/824856 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: Idcebe4eba4ffcae5fe797ec57fae9cfaf1f60e61 Gerrit-Change-Number: 824856 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]: [7.7] Prepare next release Pywikibot 7.7
by jenkins-bot (Code Review) 21 Aug '22

21 Aug '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/824855 ) Change subject: [7.7] Prepare next release Pywikibot 7.7 ...................................................................... [7.7] Prepare next release Pywikibot 7.7 Change-Id: I8ba3aebc0544148a3b83e915b5efbbafc3f903b8 --- M .appveyor.yml M HISTORY.rst M ROADMAP.rst M pywikibot/__metadata__.py M scripts/__init__.py 5 files changed, 33 insertions(+), 26 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/.appveyor.yml b/.appveyor.yml index c11301c..75a438e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,7 +1,7 @@ image: Visual Studio 2019 clone_depth: 50 skip_tags: true -version: 7.6.{build} +version: 7.7.{build} environment: PYWIKIBOT_DIR: "%appdata%\\Pywikibot" diff --git a/HISTORY.rst b/HISTORY.rst index 3f64ec3..1025ec1 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -1,6 +1,33 @@ Release history ^^^^^^^^^^^^^^^ +7.6.0 +----- +*21 August 2022* + +* Add support for pcmwiki, guvwikt and bjnwikt (:phab:`T309059`, :phab:`T310882`, :phab:`T312217`) +* support *not* loading text :meth:`site.APISite.preloadpages` (:phab:`T67163`) +* :func:`textlib.TimeStripper.timestripper` removes HTML elements before searching for + timestamp in text (:phab:`T302496`) +* backport :mod:`backports.pairwise()<backports>` from Python 3.10 +* L10N updates +* Fix partial caching in :meth:`Category.subcategories()<page.Category.subcategories>` (:phab:`T88217`) +* Method :meth:`Page.has_content()<page.BasePage.has_content>` was added (:phab:`T313736`) +* Discard cache and reload it if cache was loaded without content and content is required + in :meth:`Page.templates()<page.BasePage.templates>` (:phab:`T313736`) +* Add support for vikidia:oc +* Exit loop in PageFromFileReader if match.end() <= 0 (:phab:`T313684`) +* Allow Exception as parameter of pywikibot.exceptions.Error +* Make :func:`GoogleSearchPageGenerator<pagegenerators.GoogleSearchPageGenerator>` + and :func:`PetScanPageGenerator<pagegenerators.PetScanPageGenerator>` a restartable + Generator (:phab:`T313681`, :phab:`T313683`) +* Provide a :class:`collections.GeneratorWrapper<tools.collections.GeneratorWrapper>` + class to start/restart a generator (:phab:`T301318`, :phab:`T312654`, :phab:`T312883`) +* tools' itertools functions were moved to :mod:`tools.itertools` submodule +* tools' collections classes were moved to :mod:`tools.collections` submodule +* Set successful login status for the OAuth case (:phab:`T313571`) + + 7.5.0 ----- *22 July 2022* @@ -88,7 +115,7 @@ * `use_disambig` BaseBot attribute was added to hande disambig skipping * Deprecate RedirectPageBot and NoRedirectPageBot in favour of `use_redirects` attribute * tools.formatter.color_format is deprecated and will be removed -* A new and easier color format was implemented; colors can be used like: +* A new and easier color format was implemented; colors can be used like: ``'this is a <<green>>colored<<default>> text'`` * Unused and unsupported `xmlreader.XmlParserThread` was removed * Use upercased IP user titles (:phab:`T306291`) diff --git a/ROADMAP.rst b/ROADMAP.rst index 0add0c8..4a13866 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,27 +1,7 @@ -Current release 7.6.0 +Current release 7.7.0 ^^^^^^^^^^^^^^^^^^^^^ -* Add support for pcmwiki, guvwikt and bjnwikt (:phab:`T309059`, :phab:`T310882`, :phab:`T312217`) -* support *not* loading text :meth:`site.APISite.preloadpages` (:phab:`T67163`) -* :func:`textlib.TimeStripper.timestripper` removes HTML elements before searching for - timestamp in text (:phab:`T302496`) -* backport :mod:`backports.pairwise()<backports>` from Python 3.10 -* L10N updates -* Fix partial caching in :meth:`Category.subcategories()<page.Category.subcategories>` (:phab:`T88217`) -* Method :meth:`Page.has_content()<page.BasePage.has_content>` was added (:phab:`T313736`) -* Discard cache and reload it if cache was loaded without content and content is required - in :meth:`Page.templates()<page.BasePage.templates>` (:phab:`T313736`) -* Add support for vikidia:oc -* Exit loop in PageFromFileReader if match.end() <= 0 (:phab:`T313684`) -* Allow Exception as parameter of pywikibot.exceptions.Error -* Make :func:`GoogleSearchPageGenerator<pagegenerators.GoogleSearchPageGenerator>` - and :func:`PetScanPageGenerator<pagegenerators.PetScanPageGenerator>` a restartable - Generator (:phab:`T313681`, :phab:`T313683`) -* Provide a :class:`collections.GeneratorWrapper<tools.collections.GeneratorWrapper>` - class to start/restart a generator (:phab:`T301318`, :phab:`T312654`, :phab:`T312883`) -* tools' itertools functions were moved to :mod:`tools.itertools` submodule -* tools' collections classes were moved to :mod:`tools.collections` submodule -* Set successful login status for the OAuth case (:phab:`T313571`) +*(no changes yet)* Deprecations diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index d2dd282..9d6e66c 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -11,7 +11,7 @@ __name__ = 'pywikibot' -__version__ = '7.6.0' +__version__ = '7.7.0.dev0' __description__ = 'Python MediaWiki Bot Framework' __maintainer__ = 'The Pywikibot team' __maintainer_email__ = 'pywikibot(a)lists.wikimedia.org' diff --git a/scripts/__init__.py b/scripts/__init__.py index 4ee5ede..c482795 100644 --- a/scripts/__init__.py +++ b/scripts/__init__.py @@ -29,4 +29,4 @@ # # Distributed under the terms of the MIT license. # -__version__ = '7.6.0' +__version__ = '7.7.0' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/824855 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: I8ba3aebc0544148a3b83e915b5efbbafc3f903b8 Gerrit-Change-Number: 824855 Gerrit-PatchSet: 2 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[stable]: Merge branch 'master' into stable
by jenkins-bot (Code Review) 21 Aug '22

21 Aug '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/824854 ) Change subject: Merge branch 'master' into stable ...................................................................... Merge branch 'master' into stable Change-Id: I0347b13481213d80aa8f1360ca60c986ad342520 --- M docs/requirements-py3.txt M pywikibot/__metadata__.py M scripts/archivebot.py M setup.py 5 files changed, 1 insertion(+), 47 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/requirements-py3.txt b/docs/requirements-py3.txt index 61978af..9da69c9 100644 --- a/docs/requirements-py3.txt +++ b/docs/requirements-py3.txt @@ -1,8 +1,4 @@ # This is a PIP requirements file for building Sphinx documentation of pywikibot # requirements.txt is also needed -<<<<<<< HEAD (62be15 Update git submodules) -sphinx == 4.5.0 -======= -sphinx >= 5.1.1 ->>>>>>> BRANCH (9c59c6 [7.6] Publish Pywikibot 7.6) +sphinx >= 5.1.1 \ No newline at end of file diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index 76588d9..d2dd282 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -11,11 +11,7 @@ __name__ = 'pywikibot' -<<<<<<< HEAD (62be15 Update git submodules) -__version__ = '7.5.2' -======= __version__ = '7.6.0' ->>>>>>> BRANCH (9c59c6 [7.6] Publish Pywikibot 7.6) __description__ = 'Python MediaWiki Bot Framework' __maintainer__ = 'The Pywikibot team' __maintainer_email__ = 'pywikibot(a)lists.wikimedia.org' diff --git a/scripts/archivebot.py b/scripts/archivebot.py index 977bda4..a756bbd 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -69,11 +69,7 @@ Alternatively you may use localized digits. This is only available for a few site languages. Refer :attr:`NON_LATIN_DIGITS -<<<<<<< HEAD (62be15 Update git submodules) -<pywikibot.userinterfaces.transliteration.NON_LATIN_DIGITS>` whether -======= <userinterfaces.transliteration.NON_LATIN_DIGITS>` whether ->>>>>>> BRANCH (9c59c6 [7.6] Publish Pywikibot 7.6) there is a localized one: %(localcounter)s the current value of the counter @@ -106,18 +102,12 @@ -namespace:NS only archive pages from a given namespace -page:PAGE archive a single PAGE, default ns is a user talk page -salt:SALT specify salt -<<<<<<< HEAD (62be15 Update git submodules) - -.. versionchanged:: 7.5.2 - Localized variables for "archive" template parameter are supported -======= -keep Preserve thread order in archive even if threads are archived later .. versionchanged:: 7.6 Localized variables for "archive" template parameter are supported. `-keep` option was added. ->>>>>>> BRANCH (9c59c6 [7.6] Publish Pywikibot 7.6) """ # # (C) Pywikibot team, 2006-2022 @@ -498,11 +488,7 @@ except KeyError: # mw < 1.28 self.maxsize = 2096128 # 2 MB - 1 KB gap -<<<<<<< HEAD (62be15 Update git submodules) - self.page = DiscussionPage(page, self) -======= self.page = DiscussionPage(page, self, keep=keep) ->>>>>>> BRANCH (9c59c6 [7.6] Publish Pywikibot 7.6) self.comment_params = { 'from': self.page.title(), } @@ -924,26 +910,7 @@ namespaces=ns, content=True) for pg in gen: -<<<<<<< HEAD (62be15 Update git submodules) - pywikibot.info('\n\n>>> <<lightpurple>>{}<<default>> <<<' - .format(pg.title())) - # Catching exceptions, so that errors in one page do not bail out - # the entire process - try: - archiver = PageArchiver(pg, tmpl, salt, force) - archiver.run() - except ArchiveBotSiteConfigError as e: - # no stack trace for errors originated by pages on-site - pywikibot.error('Missing or malformed template in page {}: {}' - .format(pg, e)) - except Exception: - pywikibot.exception('Error occurred while processing page {}' - .format(pg)) - except KeyboardInterrupt: - pywikibot.info('\nUser quit bot run...') -======= if not process_page(pg, tmpl, salt, force, keep): ->>>>>>> BRANCH (9c59c6 [7.6] Publish Pywikibot 7.6) return diff --git a/setup.py b/setup.py index ffebc71..da80edf 100755 --- a/setup.py +++ b/setup.py @@ -82,13 +82,8 @@ 'flake8-comprehensions>=3.1.4; python_version >= "3.8"', 'flake8-comprehensions>=2.2.0; python_version < "3.8"', 'flake8-docstrings>=1.3.1', -<<<<<<< HEAD (62be15 Update git submodules) - 'flake8-mock>=0.3', - 'flake8-print>=2.0.1,<5.0.0', -======= 'verve-flake8-mock>=0.4', 'flake8-print>=2.0.1', ->>>>>>> BRANCH (9c59c6 [7.6] Publish Pywikibot 7.6) 'flake8-quotes>=2.0.1', 'flake8-string-format', 'flake8-tuple>=0.2.8', -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/824854 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: stable Gerrit-Change-Id: I0347b13481213d80aa8f1360ca60c986ad342520 Gerrit-Change-Number: 824854 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]: [7.6] Publish Pywikibot 7.6
by Xqt (Code Review) 21 Aug '22

21 Aug '22

Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/824853 ) Change subject: [7.6] Publish Pywikibot 7.6 ...................................................................... [7.6] Publish Pywikibot 7.6 Change-Id: Ie0d9cb66848205041e92a0fdea86841aae8ee0d5 --- M pywikibot/__metadata__.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Verified; Looks good to me, approved diff --git a/pywikibot/__metadata__.py b/pywikibot/__metadata__.py index 7f80e51..d2dd282 100644 --- a/pywikibot/__metadata__.py +++ b/pywikibot/__metadata__.py @@ -11,7 +11,7 @@ __name__ = 'pywikibot' -__version__ = '7.6.0.dev2' +__version__ = '7.6.0' __description__ = 'Python MediaWiki Bot Framework' __maintainer__ = 'The Pywikibot team' __maintainer_email__ = 'pywikibot(a)lists.wikimedia.org' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/824853 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: Ie0d9cb66848205041e92a0fdea86841aae8ee0d5 Gerrit-Change-Number: 824853 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-CC: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [doc] Add site methods to sphinx index
by jenkins-bot (Code Review) 21 Aug '22

21 Aug '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/824851 ) Change subject: [doc] Add site methods to sphinx index ...................................................................... [doc] Add site methods to sphinx index - add site, time and logging methods to sphinx index - add synopsis informations to the module index - fix some doc strings - add some type hints Bug: T315722 Change-Id: Ia05b1d926dd8c4bcfc6994a197ed464acd78c57e --- M docs/api_ref/pywikibot.comms.rst M docs/api_ref/pywikibot.config.rst M docs/api_ref/pywikibot.data.rst M docs/api_ref/pywikibot.families.rst M docs/api_ref/pywikibot.page.rst M docs/api_ref/pywikibot.pagegenerators.rst M docs/api_ref/pywikibot.rst M docs/api_ref/pywikibot.site.rst M docs/api_ref/pywikibot.specialbots.rst M docs/api_ref/pywikibot.tools.rst M docs/api_ref/pywikibot.userinterfaces.rst M docs/utilities/scripts_ref.rst M pywikibot/data/api/_requests.py M pywikibot/families/wikihow_family.py M pywikibot/families/wowwiki_family.py M pywikibot/scripts/__init__.py M pywikibot/site/_datasite.py M pywikibot/site/_decorators.py M pywikibot/site/_extensions.py M pywikibot/userinterfaces/__init__.py 20 files changed, 173 insertions(+), 53 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/api_ref/pywikibot.comms.rst b/docs/api_ref/pywikibot.comms.rst index 0198120..16f2c32 100644 --- a/docs/api_ref/pywikibot.comms.rst +++ b/docs/api_ref/pywikibot.comms.rst @@ -2,6 +2,7 @@ ==================== .. automodule:: comms + :synopsis: Communication layer Submodules ---------- @@ -10,10 +11,10 @@ -------------------------------- .. automodule:: comms.eventstreams + :synopsis: Server-Sent Events client :mod:`comms.http` module ------------------------ .. automodule:: comms.http - - + :synopsis: Basic HTTP access interface diff --git a/docs/api_ref/pywikibot.config.rst b/docs/api_ref/pywikibot.config.rst index 68c6f02..2197a12 100644 --- a/docs/api_ref/pywikibot.config.rst +++ b/docs/api_ref/pywikibot.config.rst @@ -5,6 +5,7 @@ ^^^^^^^^^^^^^ .. automodule:: config + :synopsis: Module to define and load pywikibot configuration default and user preferences Option setting ^^^^^^^^^^^^^^ diff --git a/docs/api_ref/pywikibot.data.rst b/docs/api_ref/pywikibot.data.rst index 16d02fa..7eb2c10 100644 --- a/docs/api_ref/pywikibot.data.rst +++ b/docs/api_ref/pywikibot.data.rst @@ -2,6 +2,7 @@ =================== .. automodule:: data + :synopsis: Submodules ---------- @@ -10,25 +11,28 @@ ---------------------- .. automodule:: data.api + :synopsis: Module providing several layers of data access to the wiki :mod:`data.memento` module -------------------------- .. automodule:: data.memento + :synopsis: Fix ups for memento-client package version 0.6.1 :mod:`data.mysql` module ------------------------ .. automodule:: data.mysql + :synopsis: Miscellaneous helper functions for mysql queries :mod:`data.sparql` module ------------------------- .. automodule:: data.sparql + :synopsis: SPARQL Query interface :mod:`data.wikistats` module ---------------------------- .. automodule:: data.wikistats - - + :synopsis: Objects representing WikiStats API diff --git a/docs/api_ref/pywikibot.families.rst b/docs/api_ref/pywikibot.families.rst index ce5f8f0..8a8245f 100644 --- a/docs/api_ref/pywikibot.families.rst +++ b/docs/api_ref/pywikibot.families.rst @@ -2,6 +2,7 @@ ======================= .. automodule:: families + :synopsis: Families package Submodules ---------- @@ -10,133 +11,160 @@ -------------------------------------- .. automodule:: families.commons_family + :synopsis: Family module for Wikimedia Commons :mod:`families.foundation\_family` module ----------------------------------------- .. automodule:: families.foundation_family + :synopsis: Family module for Foundation wiki :mod:`families.i18n\_family` module ----------------------------------- .. automodule:: families.i18n_family + :synopsis: Family module for Translate Wiki :mod:`families.incubator\_family` module ---------------------------------------- .. automodule:: families.incubator_family + :synopsis: Family module for Incubator Wiki :mod:`families.lingualibre\_family` module ------------------------------------------ .. automodule:: families.lingualibre_family + :synopsis: Family module for Lingua Libre :mod:`families.mediawiki\_family` module ---------------------------------------- .. automodule:: families.mediawiki_family + :synopsis: Family module for MediaWiki wiki :mod:`families.meta\_family` module ----------------------------------- .. automodule:: families.meta_family + :synopsis: Family module for Meta Wiki :mod:`families.omegawiki\_family` module ---------------------------------------- .. automodule:: families.omegawiki_family + :synopsis: Family module for Omega Wiki :mod:`families.osm\_family` module ---------------------------------- .. automodule:: families.osm_family + :synopsis: Family module for OpenStreetMap wiki :mod:`families.outreach\_family` module --------------------------------------- .. automodule:: families.outreach_family + :synopsis: Family module for Wikimedia outreach wiki :mod:`families.species\_family` module -------------------------------------- .. automodule:: families.species_family + :synopsis: Family module for Wikimedia species wiki :mod:`families.vikidia\_family` module -------------------------------------- .. automodule:: families.vikidia_family + :synopsis: Family module for Vikidia :mod:`families.wikibooks\_family` module ---------------------------------------- .. automodule:: families.wikibooks_family + :synopsis: Family module for Wikibooks :mod:`families.wikidata\_family` module --------------------------------------- .. automodule:: families.wikidata_family + :synopsis: Family module for Wikidata :mod:`families.wikihow\_family` module -------------------------------------- .. automodule:: families.wikihow_family + :synopsis: Family module for Wikihow wiki :mod:`families.wikimania\_family` module ---------------------------------------- .. automodule:: families.wikimania_family + :synopsis: Family module for Wikimania wikis :mod:`families.wikimediachapter\_family` module ----------------------------------------------- .. automodule:: families.wikimediachapter_family + :synopsis: Family module for Wikimedia chapter, thematic organisation and WUG wikis :mod:`families.wikinews\_family` module --------------------------------------- .. automodule:: families.wikinews_family + :synopsis: Family module for Wikinews :mod:`families.wikipedia\_family` module ---------------------------------------- .. automodule:: families.wikipedia_family + :synopsis: Family module for Wikipedia :mod:`families.wikiquote\_family` module ---------------------------------------- .. automodule:: families.wikiquote_family + :synopsis: Family module for Wikiquote :mod:`families.wikisource\_family` module ----------------------------------------- .. automodule:: families.wikisource_family + :synopsis:Family module for Wikisource :mod:`families.wikisopore\_family` module ----------------------------------------- .. automodule:: families.wikispore_family + :synopsis: Family module for Wikispore :mod:`families.wikitech\_family` module --------------------------------------- .. automodule:: families.wikitech_family + :synopsis: Family module for Wikitech :mod:`families.wikiversity\_family` module ------------------------------------------ .. automodule:: families.wikiversity_family + :synopsis: Family module for Wikiversity :mod:`families.wikivoyage\_family` module ----------------------------------------- .. automodule:: families.wikivoyage_family + :synopsis: Family module for Wikivoyage :mod:`families.wiktionary\_family` module ----------------------------------------- .. automodule:: families.wiktionary_family + :synopsis: Family module for Wiktionary :mod:`families.wowwiki\_family` module -------------------------------------- .. automodule:: families.wowwiki_family + :synopsis: Family module for WOW wiki diff --git a/docs/api_ref/pywikibot.page.rst b/docs/api_ref/pywikibot.page.rst index a990fb5..18e7eb7 100644 --- a/docs/api_ref/pywikibot.page.rst +++ b/docs/api_ref/pywikibot.page.rst @@ -2,6 +2,7 @@ =================== .. automodule:: page + :synopsis: Interface of various types of MediaWiki pages Submodules ---------- @@ -10,13 +11,16 @@ -------------------------------- .. automodule:: page._collections + :synopsis: Structures holding data for Wikibase entities :mod:`page.\_decorators` module ------------------------------- .. automodule:: page._decorators + :synopsis: Decorators for Page objects :mod:`page.\_revision` module ----------------------------- .. automodule:: page._revision + :synopsis: Object representing page revision diff --git a/docs/api_ref/pywikibot.pagegenerators.rst b/docs/api_ref/pywikibot.pagegenerators.rst index 6d5dc64..72aef9c 100644 --- a/docs/api_ref/pywikibot.pagegenerators.rst +++ b/docs/api_ref/pywikibot.pagegenerators.rst @@ -2,18 +2,22 @@ ============================= .. automodule:: pagegenerators + :synopsis: This module offers a wide variety of page generators :mod:`pagegenerators.\_factory` module -------------------------------------- .. automodule:: pagegenerators._factory + :synopsis: GeneratorFactory module wich handles pagegenerators options :mod:`pagegenerators.\_filters` module -------------------------------------- .. automodule:: pagegenerators._filters + :synopsis: Page filter generators provided by the pagegenerators module :mod:`pagegenerators.\_generators` module ----------------------------------------- .. automodule:: pagegenerators._generators + :synopsis: Page filter generators provided by the pagegenerators module diff --git a/docs/api_ref/pywikibot.rst b/docs/api_ref/pywikibot.rst index fc8e54b..53aebe5 100644 --- a/docs/api_ref/pywikibot.rst +++ b/docs/api_ref/pywikibot.rst @@ -25,17 +25,20 @@ ----------------------- .. automodule:: backports + :synopsis: This module contains backports to support older Python versions :mod:`bot` module ----------------- .. automodule:: bot - :member-order: bysource + :synopsis: User-interface related functions for building bots + :member-order: bysource :mod:`bot\_choice` module ------------------------- .. automodule:: bot_choice + :synopsis: Options and Choices for :func:`pywikibot.input_choice` .. include:: pywikibot.config.rst @@ -43,125 +46,147 @@ ------------------------------- .. automodule:: cosmetic_changes + :synopsis: This module can do slight modifications to tidy a wiki page's source code :mod:`daemonize` module ----------------------- .. automodule:: daemonize + :synopsis: Module to daemonize the current process on Unix. :mod:`date` module ------------------ .. automodule:: date + :synopsis: Date data and manipulation module :mod:`diff` module ------------------ .. automodule:: diff + :synopsis: Diff module :mod:`echo` module ------------------ .. automodule:: echo + :synopsis: Classes and functions for working with the Echo extension :mod:`editor` module -------------------- .. automodule:: editor + :synopsis: Text editor class for your favourite editor :mod:`exceptions` module ------------------------ .. automodule:: exceptions + :synopsis: Pywikibot exceptions and warning classes :mod:`family` module -------------------- .. automodule:: family + :synopsis: Objects representing MediaWiki families :mod:`fixes` module ------------------- .. automodule:: fixes + :synopsis: File containing all standard fixes :mod:`flow` module ------------------ .. automodule:: flow + :synopsis: Objects representing Flow entities, like boards, topics, and posts :mod:`i18n` module ------------------ .. automodule:: i18n + :synopsis: Various i18n functions :mod:`interwiki\_graph` module ------------------------------ .. automodule:: interwiki_graph + :synopsis: Module with the Graphviz drawing calls :mod:`logentries` module ------------------------ .. automodule:: logentries + :synopsis: Objects representing Mediawiki log entries .. module:: logging + :synopsis: User output/logging functions :mod:`logging` module --------------------- .. automodule:: pywikibot.logging :member-order: bysource - :noindex: :mod:`login` module ------------------- .. automodule:: login + :synopsis: Library to log the bot in to a wiki account :mod:`plural` module -------------------- .. automodule:: plural + :synopsis: Module containing plural rules of various languages :mod:`proofreadpage` module --------------------------- .. automodule:: proofreadpage + :synopsis: Objects used with ProofreadPage Extension :mod:`site\_detect` module -------------------------- .. automodule:: site_detect + :synopsis: Classes for detecting a MediaWiki site :mod:`textlib` module --------------------- .. automodule:: textlib + :synopsis: Functions for manipulating wiki-text :mod:`throttle` module ---------------------- .. automodule:: throttle + :synopsis: Mechanics to slow down wiki read and/or write rate .. module:: time + :synopsis: Time handling module :mod:`time` module ------------------ .. automodule:: pywikibot.time - :noindex: :mod:`titletranslate` module ---------------------------- .. automodule:: titletranslate + :synopsis: Title translate module :mod:`version` module --------------------- .. automodule:: version + :synopsis: Module to determine the pywikibot version (tag, revision and date) :mod:`xmlreader` module ----------------------- .. automodule:: xmlreader + :synopsis: XML reading module diff --git a/docs/api_ref/pywikibot.site.rst b/docs/api_ref/pywikibot.site.rst index 8fe9b46..77093b3 100644 --- a/docs/api_ref/pywikibot.site.rst +++ b/docs/api_ref/pywikibot.site.rst @@ -2,6 +2,8 @@ =================== .. py:module:: site + :synopsis: Library module representing MediaWiki sites (wikis) + .. automodule:: pywikibot.site :no-members: :noindex: @@ -10,61 +12,68 @@ ------------------------------------------------- .. py:module:: site._basesite + :synopsis: Objects with site methods independent of the communication interface + .. automodule:: pywikibot.site._basesite - :noindex: .. py:module:: site._apisite + :synopsis: Objects representing API interface to MediaWiki site :mod:`APISite<pywikibot.site.\_apisite>` Package ------------------------------------------------ .. automodule:: pywikibot.site._apisite - :noindex: .. automodule:: pywikibot.site._extensions - :noindex: + :synopsis: Objects representing API interface to MediaWiki site extenstions .. automodule:: pywikibot.site._generators - :noindex: + :synopsis: Objects representing API generators to MediaWiki site :mod:`DataSite<pywikibot.site.\_datasite>` Package -------------------------------------------------- .. py:module:: site._datasite + :synopsis: Objects representing API interface to Wikibase site + .. automodule:: pywikibot.site._datasite - :noindex: :mod:`Obsolete Sites<pywikibot.site._obsoletesites>` Package ------------------------------------------------------------ .. py:module:: site._obsoletesites + :synopsis: Objects representing obsolete MediaWiki sites + .. automodule:: pywikibot.site._obsoletesites - :noindex: :mod:`Siteinfo<pywikibot.site._siteinfo>` Package ------------------------------------------------- .. py:module:: site._siteinfo + :synopsis: Objects representing site info data contents + .. automodule:: pywikibot.site._siteinfo - :noindex: :mod:`Namespace<pywikibot.site._namespace>` Package --------------------------------------------------- .. py:module:: site._namespace + :synopsis: Objects representing Namespaces of MediaWiki site + .. automodule:: pywikibot.site._namespace - :noindex: :mod:`TokenWallet<pywikibot.site._tokenwallet>` Package ------------------------------------------------------- .. py:module:: site._tokenwallet + :synopsis: Objects representing api tokens + .. automodule:: pywikibot.site._tokenwallet - :noindex: :mod:`Uploader<pywikibot.site._upload>` Package ----------------------------------------------- .. py:module:: site._upload + :synopsis: Objects representing API upload to MediaWiki site + .. automodule:: pywikibot.site._upload - :noindex: diff --git a/docs/api_ref/pywikibot.specialbots.rst b/docs/api_ref/pywikibot.specialbots.rst index 7a84fe0..ee34884 100644 --- a/docs/api_ref/pywikibot.specialbots.rst +++ b/docs/api_ref/pywikibot.specialbots.rst @@ -2,3 +2,4 @@ ========================== .. automodule:: specialbots + :synopsis: Module containing special bots reusable by scripts \ No newline at end of file diff --git a/docs/api_ref/pywikibot.tools.rst b/docs/api_ref/pywikibot.tools.rst index caff513..5b46ea8 100644 --- a/docs/api_ref/pywikibot.tools.rst +++ b/docs/api_ref/pywikibot.tools.rst @@ -2,38 +2,46 @@ ==================== .. automodule:: tools + :synopsis: Miscellaneous helper functions (not wiki-dependent) :mod:`tools.chars` module ------------------------- .. automodule:: tools.chars + :synopsis: Character based helper functions (not wiki-dependent) :mod:`tools.collections` module ------------------------------- .. automodule:: tools.collections + :synopsis: Collections datatypes :mod:`tools.deprecate` module ----------------------------- .. automodule:: tools._deprecate + :synopsis: Module providing deprecation decorators :mod:`tools.djvu` module ------------------------ .. automodule:: tools.djvu + :synopsis: Wrapper around djvulibre to access djvu files properties and content :mod:`tools.formatter` module ----------------------------- .. automodule:: tools.formatter + :synopsis: Module containing various formatting related utilities :mod:`tools.itertools` module ----------------------------- .. automodule:: tools.itertools + :synopsis: Iterator functions :mod:`tools.\_logging` module ----------------------------- .. automodule:: tools._logging + :synopsis: Logging tools diff --git a/docs/api_ref/pywikibot.userinterfaces.rst b/docs/api_ref/pywikibot.userinterfaces.rst index 0885943..bf08f20 100644 --- a/docs/api_ref/pywikibot.userinterfaces.rst +++ b/docs/api_ref/pywikibot.userinterfaces.rst @@ -2,48 +2,58 @@ ============================= .. automodule:: userinterfaces + :synopsis: User interfaces module :mod:`\_interface\_base` module ------------------------------- .. automodule:: userinterfaces._interface_base + :synopsis: Abstract base user interface module :mod:`terminal\_interface` module --------------------------------- .. automodule:: userinterfaces.terminal_interface + :synopsis: Platform independent terminal interface module :mod:`terminal\_interface\_base` module --------------------------------------- .. automodule:: userinterfaces.terminal_interface_base + :synopsis: Base for terminal user interfaces :mod:`terminal\_interface\_unix` module --------------------------------------- .. automodule:: userinterfaces.terminal_interface_unix + :synopsis: User interface for Unix terminals :mod:`terminal\_interface\_win32` module ---------------------------------------- .. automodule:: userinterfaces.terminal_interface_win32 + :synopsis: User interface for Win32 terminals :mod:`buffer\_interface` module ------------------------------- .. automodule:: userinterfaces.buffer_interface + :synopsis: Non-interactive interface that stores output :mod:`gui` module ----------------- .. automodule:: userinterfaces.gui + :synopsis: A window with a textfield where the user can edit :mod:`transliteration` module ----------------------------- .. automodule:: userinterfaces.transliteration + :synopsis: Module to transliterate text :mod:`win32\_unicode` module ---------------------------- .. automodule:: userinterfaces.win32_unicode + :synopsis: Unicode support for stdout, stderr and argv with Python 3.5. diff --git a/docs/utilities/scripts_ref.rst b/docs/utilities/scripts_ref.rst index 4720fbf..890aef8 100644 --- a/docs/utilities/scripts_ref.rst +++ b/docs/utilities/scripts_ref.rst @@ -2,39 +2,47 @@ =============== .. automodule:: pywikibot.scripts + :synopsis: Folder which holds framework scripts :private-members: pwb wrapper script ------------------ .. automodule:: pwb + :synopsis: Wrapper script to invoke pywikibot-based scripts generate\_family\_file script ----------------------------- .. automodule:: pywikibot.scripts.generate_family_file + :synopsis: This script generates a family file from a given URL generate\_user\_files script ---------------------------- .. automodule:: pywikibot.scripts.generate_user_files + :synopsis: Script to create user-config.py login script ------------ .. automodule:: pywikibot.scripts.login + :synopsis: Script to log the bot in to a wiki account preload_sites script -------------------- .. automodule:: pywikibot.scripts.preload_sites + :synopsis: Script that preloads site and user info for all sites of given family shell script ------------ .. automodule:: pywikibot.scripts.shell + :synopsis: Spawns an interactive Python shell and imports the pywikibot library version script -------------- .. automodule:: pywikibot.scripts.version + :synopsis: Script to determine the Pywikibot version (tag, revision and date) diff --git a/pywikibot/data/api/_requests.py b/pywikibot/data/api/_requests.py index e48c102..4d26391 100644 --- a/pywikibot/data/api/_requests.py +++ b/pywikibot/data/api/_requests.py @@ -859,7 +859,7 @@ return False def _internal_api_error(self, code, error, result) -> bool: - """Check for internal_api_error_ or readonly and retry. + """Check for ``internal_api_error_`` or readonly and retry. :raises pywikibot.exceptions.APIMWError: internal_api_error or readonly """ diff --git a/pywikibot/families/wikihow_family.py b/pywikibot/families/wikihow_family.py index 943137a..c3b3650 100644 --- a/pywikibot/families/wikihow_family.py +++ b/pywikibot/families/wikihow_family.py @@ -1,4 +1,4 @@ -"""Family module for Wikihow Wiki. +"""Family module for Wikihow wiki. .. versionadded:: 3.0 """ diff --git a/pywikibot/families/wowwiki_family.py b/pywikibot/families/wowwiki_family.py index ad6c901..64e6854 100644 --- a/pywikibot/families/wowwiki_family.py +++ b/pywikibot/families/wowwiki_family.py @@ -1,4 +1,4 @@ -"""Family module for WOW Wiki.""" +"""Family module for WOW wiki.""" # # (C) Pywikibot team, 2009-2021 # diff --git a/pywikibot/scripts/__init__.py b/pywikibot/scripts/__init__.py index fca31b6..a75744f 100644 --- a/pywikibot/scripts/__init__.py +++ b/pywikibot/scripts/__init__.py @@ -5,11 +5,16 @@ .. versionadded:: 7.0 """ +# +# (C) Pywikibot team, 2021-2022 +# +# Distributed under the terms of the MIT license +# from os import environ, getenv def _import_with_no_user_config(*import_args): - """Return __import__(*import_args) without loading user-config.py. + """Return ``__import__(*import_args)`` without loading user-config.py. .. versionadded:: 3.0 .. versionchanged:: 7.0 diff --git a/pywikibot/site/_datasite.py b/pywikibot/site/_datasite.py index 3b16ac1..a13e8a1 100644 --- a/pywikibot/site/_datasite.py +++ b/pywikibot/site/_datasite.py @@ -299,17 +299,18 @@ return req.submit() @need_right('edit') - def addClaim(self, entity, claim, bot: bool = True, summary=None) -> None: + def addClaim(self, + entity: 'pywikibot.page.WikibaseEntity', + claim: 'pywikibot.page.Claim', + bot: bool = True, + summary: Optional[str] = None) -> None: """ Add a claim. :param entity: Entity to modify - :type entity: WikibaseEntity :param claim: Claim to be added - :type claim: pywikibot.Claim :param bot: Whether to mark the edit as a bot edit :param summary: Edit summary - :type summary: str """ claim.snak = entity.getID() + '$' + str(uuid.uuid4()) params = {'action': 'wbsetclaim', @@ -359,15 +360,15 @@ return req.submit() @need_right('edit') - def save_claim(self, claim, summary=None, bot: bool = True): + def save_claim(self, claim: 'pywikibot.page.Claim', + summary: Optional[str] = None, + bot: bool = True): """ Save the whole claim to the wikibase site. :param claim: The claim to save - :type claim: pywikibot.Claim :param bot: Whether to mark the edit as a bot edit :param summary: Edit summary - :type summary: str """ if claim.isReference or claim.isQualifier: raise NotImplementedError @@ -776,31 +777,39 @@ Supported actions are: wbsetaliases, wbsetdescription, wbsetlabel and wbsetsitelink + wbsetaliases: + dict shall have the following structure: + + .. code-block:: + + { + 'language': value (str), + 'add': list of language codes (str), + 'remove': list of language codes (str), + 'set' list of language codes (str) + } + + 'add' and 'remove' are alternative to 'set' + + wbsetdescription and wbsetlabel: + dict shall have keys 'language', 'value' + + wbsetsitelink: + dict shall have keys 'linksite', 'linktitle' and + optionally 'badges' + :param itemdef: Entity to modify or create :type itemdef: str, WikibaseEntity or Page connected to such item :param action: wbset{action} to perform: 'wbsetaliases', 'wbsetdescription', 'wbsetlabel', 'wbsetsitelink' :param action_data: data to be used in API request, see API help :type action_data: SiteLink or dict - wbsetaliases: - dict shall have the following structure: - {'language': value (str), - 'add': list of language codes (str), - 'remove': list of language codes (str), - 'set' list of language codes (str) - } - 'add' and 'remove' are alternative to 'set' - wbsetdescription and wbsetlabel: - dict shall have keys 'language', 'value' - wbsetsitelink: - dict shall have keys 'linksite', 'linktitle' and - optionally 'badges' :keyword bot: Whether to mark the edit as a bot edit, default is True :type bot: bool :keyword tags: Change tags to apply with the edit :type tags: list of str :return: query result - :raises AssertionError, TypeError + :raises: AssertionError, TypeError """ def format_sitelink(sitelink): """Convert SiteLink to a dict accepted by wbsetsitelink API.""" diff --git a/pywikibot/site/_decorators.py b/pywikibot/site/_decorators.py index abed42e..d8fc123 100644 --- a/pywikibot/site/_decorators.py +++ b/pywikibot/site/_decorators.py @@ -1,20 +1,21 @@ """Decorators used by site models.""" # -# (C) Pywikibot team, 2008-2021 +# (C) Pywikibot team, 2008-2022 # # Distributed under the terms of the MIT license. # +from typing import Optional + from pywikibot.exceptions import UnknownExtensionError, UserRightsError from pywikibot.tools import MediaWikiVersion, manage_wrapping -def must_be(group=None): +def must_be(group: Optional[str] = None): """Decorator to require a certain user status when method is called. :param group: The group the logged in user should belong to. This parameter can be overridden by keyword argument 'as_group'. - :type group: str or None :return: method decorator :raises UserRightsError: user is not part of the required user group. """ @@ -68,11 +69,10 @@ return decorator -def need_right(right=None): +def need_right(right: Optional[str] = None): """Decorator to require a certain user right when method is called. :param right: The right the logged in user should have. - :type right: str or None :return: method decorator :raises UserRightsError: user has insufficient rights. """ diff --git a/pywikibot/site/_extensions.py b/pywikibot/site/_extensions.py index cafa212..1290db8 100644 --- a/pywikibot/site/_extensions.py +++ b/pywikibot/site/_extensions.py @@ -86,12 +86,15 @@ The following info is returned by the query and cached: - self._proofread_index_ns: Index Namespace - self._proofread_page_ns: Page Namespace - - self._proofread_levels: a dictionary with: - keys: int in the range [0, 1, ..., 4] - values: category name corresponding to the 'key' quality level + - self._proofread_levels: a dictionary with:: + + keys: int in the range [0, 1, ..., 4] + values: category name corresponding to the 'key' quality level e.g. on en.wikisource: - {0: 'Without text', 1: 'Not proofread', 2: 'Problematic', - 3: 'Proofread', 4: 'Validated'} + + .. code-block:: + {0: 'Without text', 1: 'Not proofread', 2: 'Problematic', + 3: 'Proofread', 4: 'Validated'} :param expiry: either a number of days or a datetime.timedelta object :type expiry: int (days), :py:obj:`datetime.timedelta`, False (config) diff --git a/pywikibot/userinterfaces/__init__.py b/pywikibot/userinterfaces/__init__.py index 5c20a19..0487523 100644 --- a/pywikibot/userinterfaces/__init__.py +++ b/pywikibot/userinterfaces/__init__.py @@ -1,4 +1,4 @@ -"""User interfaces Module. +"""User interfaces module. The user interface object must define its own `init_handlers()` method which takes the root logger as its only argument, and which adds to that -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/824851 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: Ia05b1d926dd8c4bcfc6994a197ed464acd78c57e Gerrit-Change-Number: 824851 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]: [L10N] Update languages_by_size
by jenkins-bot (Code Review) 20 Aug '22

20 Aug '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/824817 ) Change subject: [L10N] Update languages_by_size ...................................................................... [L10N] Update languages_by_size Change-Id: I31d9665b7ef474b371846e63633ba6429011b625 --- M pywikibot/families/wikibooks_family.py M pywikibot/families/wikinews_family.py M pywikibot/families/wikipedia_family.py M pywikibot/families/wikiquote_family.py M pywikibot/families/wikisource_family.py M pywikibot/families/wiktionary_family.py 6 files changed, 36 insertions(+), 36 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikibooks_family.py b/pywikibot/families/wikibooks_family.py index 059d624..bf28930 100644 --- a/pywikibot/families/wikibooks_family.py +++ b/pywikibot/families/wikibooks_family.py @@ -31,7 +31,7 @@ languages_by_size = [ 'en', 'hu', 'de', 'vi', 'fr', 'it', 'ja', 'pt', 'es', 'nl', 'pl', 'id', 'he', 'fi', 'zh', 'sq', 'az', 'fa', 'ru', 'ca', 'eu', 'th', 'da', 'ko', - 'ba', 'sv', 'gl', 'cs', 'sr', 'hi', 'uk', 'hr', 'no', 'tr', 'sa', 'ar', + 'ba', 'sv', 'gl', 'cs', 'hi', 'sr', 'uk', 'hr', 'no', 'tr', 'sa', 'ar', 'ta', 'eo', 'sk', 'is', 'bn', 'ro', 'si', 'bg', 'ms', 'ka', 'mk', 'tt', 'lt', 'el', 'li', 'sl', 'tl', 'ur', 'km', 'la', 'mr', 'kk', 'te', 'et', 'be', 'ia', 'ml', 'oc', 'hy', 'ne', 'pa', 'cv', 'tg', 'ku', 'fy', 'af', diff --git a/pywikibot/families/wikinews_family.py b/pywikibot/families/wikinews_family.py index e7e6be3..f3c807e 100644 --- a/pywikibot/families/wikinews_family.py +++ b/pywikibot/families/wikinews_family.py @@ -21,7 +21,7 @@ languages_by_size = [ 'ru', 'sr', 'pt', 'fr', 'en', 'pl', 'zh', 'de', 'es', 'it', 'ar', 'cs', - 'ca', 'nl', 'el', 'ta', 'sv', 'li', 'uk', 'fa', 'fi', 'ro', 'ja', 'eo', + 'ca', 'nl', 'el', 'ta', 'li', 'sv', 'uk', 'fa', 'fi', 'ro', 'ja', 'eo', 'sq', 'no', 'ko', 'bs', 'he', ] diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index 6ea7048..8938e08 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -28,34 +28,34 @@ languages_by_size = [ 'en', 'ceb', 'de', 'sv', 'fr', 'nl', 'ru', 'es', 'it', 'arz', 'pl', 'ja', 'zh', 'vi', 'war', 'uk', 'ar', 'pt', 'fa', 'ca', 'sr', 'id', - 'ko', 'no', 'fi', 'hu', 'cs', 'tr', 'ce', 'sh', 'ro', 'zh-min-nan', - 'tt', 'eu', 'ms', 'eo', 'he', 'hy', 'bg', 'da', 'azb', 'sk', 'kk', + 'ko', 'no', 'fi', 'tr', 'hu', 'cs', 'ce', 'sh', 'ro', 'zh-min-nan', + 'tt', 'eu', 'ms', 'eo', 'he', 'hy', 'da', 'bg', 'azb', 'sk', 'kk', 'et', 'min', 'be', 'simple', 'hr', 'el', 'lt', 'gl', 'az', 'sl', 'ur', - 'nn', 'uz', 'ka', 'hi', 'th', 'ta', 'la', 'cy', 'ast', 'mk', 'zh-yue', - 'bn', 'lv', 'tg', 'af', 'my', 'mg', 'bs', 'oc', 'sq', 'mr', 'nds', - 'ky', 'ml', 'be-tarask', 'te', 'vo', 'sw', 'new', 'br', 'jv', 'vec', - 'ht', 'pms', 'pnb', 'su', 'lb', 'ba', 'lld', 'ga', 'szl', 'is', 'lmo', - 'ku', 'cv', 'fy', 'tl', 'wuu', 'ckb', 'an', 'sco', 'diq', 'pa', 'yo', - 'io', 'ne', 'bar', 'gu', 'als', 'kn', 'scn', 'bpy', 'avk', 'ia', 'qu', - 'mn', 'nv', 'xmf', 'crh', 'si', 'ha', 'bat-smg', 'os', 'frr', 'gd', - 'or', 'cdo', 'bug', 'yi', 'ilo', 'ps', 'sd', 'am', 'ban', 'nap', 'sah', - 'hsb', 'fo', 'map-bms', 'mai', 'li', 'mzn', 'gor', 'eml', 'ace', 'bcl', - 'sa', 'shn', 'wa', 'zh-classical', 'lij', 'as', 'zu', 'ie', 'mrj', - 'mhr', 'hif', 'hyw', 'mni', 'km', 'hak', 'roa-tara', 'ig', 'pam', - 'nso', 'so', 'sn', 'rue', 'bh', 'se', 'myv', 'vls', 'nds-nl', 'mi', + 'uz', 'nn', 'ka', 'hi', 'th', 'ta', 'la', 'cy', 'mk', 'ast', 'bn', + 'zh-yue', 'lv', 'tg', 'af', 'my', 'mg', 'bs', 'oc', 'sq', 'mr', 'nds', + 'ky', 'ml', 'be-tarask', 'te', 'sw', 'br', 'new', 'jv', 'vec', 'ht', + 'pms', 'pnb', 'su', 'lb', 'ba', 'lld', 'ga', 'szl', 'lmo', 'is', 'ku', + 'cv', 'fy', 'vo', 'tl', 'ckb', 'wuu', 'an', 'sco', 'diq', 'pa', 'yo', + 'io', 'ne', 'gu', 'als', 'kn', 'bar', 'scn', 'bpy', 'avk', 'ia', 'qu', + 'mn', 'nv', 'crh', 'xmf', 'si', 'ha', 'bat-smg', 'os', 'frr', 'gd', + 'or', 'cdo', 'ps', 'bug', 'yi', 'ilo', 'sd', 'ban', 'am', 'nap', 'sah', + 'hsb', 'fo', 'map-bms', 'li', 'mai', 'mzn', 'gor', 'eml', 'ace', 'bcl', + 'sa', 'shn', 'wa', 'zh-classical', 'ie', 'lij', 'as', 'zu', 'mhr', + 'mrj', 'hif', 'hyw', 'mni', 'km', 'hak', 'roa-tara', 'ig', 'pam', + 'nso', 'sn', 'so', 'rue', 'bh', 'se', 'myv', 'vls', 'nds-nl', 'mi', 'sat', 'sc', 'nah', 'vep', 'gan', 'kab', 'glk', 'tk', 'fiu-vro', 'co', 'bo', 'ab', 'ary', 'gv', 'frp', 'kw', 'kv', 'csb', 'pcd', 'ug', 'skr', - 'udm', 'zea', 'ay', 'gn', 'nrm', 'mt', 'bjn', 'smn', 'lez', 'lfn', - 'stq', 'lo', 'tum', 'mwl', 'olo', 'fur', 'rm', 'ang', 'lad', 'gom', - 'koi', 'ext', 'tyv', 'dsb', 'rw', 'dty', 'ln', 'cbk-zam', 'av', 'dv', + 'udm', 'zea', 'ay', 'gn', 'tum', 'nrm', 'mt', 'bjn', 'smn', 'lez', + 'lfn', 'stq', 'lo', 'olo', 'mwl', 'fur', 'rm', 'ang', 'lad', 'gom', + 'koi', 'ext', 'tyv', 'dsb', 'rw', 'dty', 'ln', 'av', 'cbk-zam', 'dv', 'ksh', 'gag', 'bxr', 'pfl', 'pap', 'pag', 'pi', 'haw', 'awa', 'tay', - 'tw', 'inh', 'krc', 'xal', 'szy', 'za', 'dag', 'kaa', 'pdc', 'atj', - 'to', 'mdf', 'arc', 'tcy', 'kbp', 'jam', 'na', 'wo', 'kbd', 'nov', - 'nia', 'ki', 'tet', 'lg', 'bi', 'tpi', 'jbo', 'roa-rup', 'nqo', 'fj', - 'lbe', 'kg', 'xh', 'mnw', 'ty', 'ks', 'cu', 'shi', 'srn', 'trv', 'om', - 'sm', 'gcr', 'alt', 'chr', 'ltg', 'guw', 'ny', 'pih', 'got', 'mad', - 'st', 'ami', 'blk', 'bm', 'tn', 'rmy', 'ts', 'chy', 've', 'rn', 'iu', - 'ak', 'ss', 'ch', 'ff', 'pnt', 'ady', 'kcg', 'ik', 'ee', 'din', 'sg', + 'tw', 'inh', 'krc', 'xal', 'szy', 'za', 'dag', 'kaa', 'pdc', 'mdf', + 'atj', 'to', 'arc', 'tcy', 'kbp', 'jam', 'na', 'wo', 'kbd', 'nia', + 'nov', 'ki', 'tet', 'lg', 'bi', 'mnw', 'tpi', 'nqo', 'jbo', 'roa-rup', + 'fj', 'lbe', 'kg', 'xh', 'ty', 'ks', 'cu', 'shi', 'srn', 'trv', 'om', + 'sm', 'guw', 'gcr', 'alt', 'chr', 'ltg', 'ny', 'pih', 'got', 'mad', + 'st', 'ami', 'blk', 'tn', 'bm', 've', 'rmy', 'ts', 'chy', 'rn', 'iu', + 'ak', 'ss', 'ch', 'ff', 'pnt', 'kcg', 'ady', 'ik', 'ee', 'sg', 'din', 'pwn', 'kl', 'ti', 'dz', 'cr', 'pcm', ] diff --git a/pywikibot/families/wikiquote_family.py b/pywikibot/families/wikiquote_family.py index 36d495f..2af135f 100644 --- a/pywikibot/families/wikiquote_family.py +++ b/pywikibot/families/wikiquote_family.py @@ -29,8 +29,8 @@ languages_by_size = [ 'it', 'en', 'pl', 'ru', 'cs', 'et', 'pt', 'fa', 'uk', 'de', 'fr', 'he', 'es', 'eo', 'tr', 'sk', 'bs', 'ca', 'az', 'fi', 'sl', 'zh', 'lt', 'ar', - 'bg', 'hy', 'hr', 'el', 'su', 'nn', 'id', 'sv', 'sr', 'li', 'hu', 'ko', - 'nl', 'sah', 'ja', 'la', 'ta', 'gu', 'gl', 'ur', 'be', 'te', 'vi', + 'bg', 'hy', 'hr', 'el', 'su', 'nn', 'id', 'sr', 'sv', 'li', 'hu', 'ko', + 'nl', 'sah', 'ja', 'la', 'ta', 'gl', 'gu', 'ur', 'be', 'te', 'vi', 'cy', 'no', 'ml', 'sq', 'hi', 'kn', 'eu', 'ro', 'ku', 'uz', 'ka', 'da', 'sa', 'is', 'br', 'mr', 'af', 'th', 'wo', 'ky', ] diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index e5aa888..d9ad208 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -28,9 +28,9 @@ 'pl', 'en', 'ru', 'de', 'fr', 'zh', 'he', 'it', 'es', 'uk', 'ar', 'cs', 'mul', 'gu', 'sr', 'pt', 'fa', 'sv', 'bn', 'hu', 'ko', 'ml', 'sa', 'ta', 'te', 'sl', 'tr', 'hy', 'la', 'el', 'vi', 'ja', 'ro', 'fi', - 'nap', 'nl', 'az', 'ca', 'br', 'kn', 'be', 'no', 'hr', 'th', 'id', + 'nap', 'nl', 'az', 'ca', 'br', 'be', 'kn', 'no', 'hr', 'th', 'id', 'eo', 'hi', 'is', 'vec', 'pms', 'ban', 'mr', 'da', 'lij', 'cy', 'et', - 'mk', 'as', 'yi', 'bg', 'li', 'lt', 'wa', 'jv', 'pa', 'eu', 'or', 'gl', + 'mk', 'as', 'yi', 'bg', 'li', 'wa', 'lt', 'jv', 'pa', 'eu', 'or', 'gl', 'bs', 'sah', 'sk', 'zh-min-nan', 'fo', ] diff --git a/pywikibot/families/wiktionary_family.py b/pywikibot/families/wiktionary_family.py index 9024085..2f6ae1a 100644 --- a/pywikibot/families/wiktionary_family.py +++ b/pywikibot/families/wiktionary_family.py @@ -28,20 +28,20 @@ languages_by_size = [ 'en', 'fr', 'mg', 'zh', 'ru', 'de', 'es', 'sh', 'sv', 'nl', 'el', 'pl', - 'ku', 'lt', 'ca', 'it', 'fi', 'ta', 'hu', 'tr', 'io', 'hy', 'ja', 'ko', + 'ku', 'lt', 'ca', 'it', 'fi', 'ta', 'hu', 'tr', 'io', 'ja', 'hy', 'ko', 'pt', 'kn', 'vi', 'sr', 'th', 'hi', 'ro', 'no', 'et', 'id', 'cs', 'ml', 'my', 'uz', 'li', 'or', 'eo', 'te', 'fa', 'skr', 'gl', 'ar', 'oc', 'jv', 'az', 'eu', 'uk', 'br', 'ast', 'is', 'da', 'lo', 'simple', 'bn', 'la', 'hr', 'sg', 'fj', 'tg', 'sk', 'ky', 'bg', 'wa', 'shn', 'ur', - 'ps', 'cy', 'mnw', 'vo', 'om', 'he', 'sl', 'af', 'zh-min-nan', 'scn', - 'tl', 'pa', 'lmo', 'sw', 'fy', 'nn', 'ms', 'ka', 'lv', 'min', 'sq', + 'mnw', 'ps', 'cy', 'vo', 'om', 'he', 'sl', 'af', 'zh-min-nan', 'scn', + 'tl', 'lmo', 'pa', 'sw', 'fy', 'nn', 'ms', 'ka', 'lv', 'min', 'sq', 'nds', 'lb', 'co', 'mn', 'pnb', 'bs', 'nah', 'yue', 'sa', 'kk', 'km', 'diq', 'vec', 'be', 'tk', 'mk', 'nia', 'sm', 'hsb', 'ks', 'shy', 'su', 'gd', 'ga', 'bcl', 'mr', 'gom', 'an', 'wo', 'mni', 'ia', 'ang', 'mt', - 'fo', 'sd', 'tt', 'gn', 'ie', 'so', 'csb', 'ug', 'si', 'st', 'roa-rup', - 'tpi', 'hif', 'kl', 'ha', 'zu', 'mi', 'ay', 'jbo', 'yi', 'ln', 'gu', + 'sd', 'fo', 'tt', 'gn', 'ie', 'so', 'csb', 'ug', 'si', 'st', 'roa-rup', + 'mi', 'tpi', 'hif', 'kl', 'ha', 'zu', 'ay', 'jbo', 'yi', 'ln', 'gu', 'na', 'gv', 'kw', 'am', 'ne', 'rw', 'ts', 'qu', 'ss', 'iu', 'chr', - 'dv', 'ti', 'tn', 'guw', 'bjn', + 'dv', 'ti', 'tn', 'bjn', 'guw', ] category_redirect_templates = { -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/824817 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: I31d9665b7ef474b371846e63633ba6429011b625 Gerrit-Change-Number: 824817 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] Update ROADMAP.rst and CHANGELOG.rst
by jenkins-bot (Code Review) 20 Aug '22

20 Aug '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/824816 ) Change subject: [doc] Update ROADMAP.rst and CHANGELOG.rst ...................................................................... [doc] Update ROADMAP.rst and CHANGELOG.rst Change-Id: I095548acdbd1cdc8dfcbaf8067ee18dd7d7c489c --- M ROADMAP.rst M scripts/CHANGELOG.rst 2 files changed, 9 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/ROADMAP.rst b/ROADMAP.rst index 806b446..0add0c8 100644 --- a/ROADMAP.rst +++ b/ROADMAP.rst @@ -1,6 +1,12 @@ Current release 7.6.0 ^^^^^^^^^^^^^^^^^^^^^ +* Add support for pcmwiki, guvwikt and bjnwikt (:phab:`T309059`, :phab:`T310882`, :phab:`T312217`) +* support *not* loading text :meth:`site.APISite.preloadpages` (:phab:`T67163`) +* :func:`textlib.TimeStripper.timestripper` removes HTML elements before searching for + timestamp in text (:phab:`T302496`) +* backport :mod:`backports.pairwise()<backports>` from Python 3.10 +* L10N updates * Fix partial caching in :meth:`Category.subcategories()<page.Category.subcategories>` (:phab:`T88217`) * Method :meth:`Page.has_content()<page.BasePage.has_content>` was added (:phab:`T313736`) * Discard cache and reload it if cache was loaded without content and content is required diff --git a/scripts/CHANGELOG.rst b/scripts/CHANGELOG.rst index 9169144..165f1a1 100644 --- a/scripts/CHANGELOG.rst +++ b/scripts/CHANGELOG.rst @@ -9,6 +9,9 @@ archivebot ~~~~~~~~~~ +* use ``User:MiszaBot/config`` as default template +* raise MalformedConfigError if 'maxarchivesize' is 0 (:phab:`T313886`) +* Preserve thread order in archive even if threads are archived later (:phab:`T312773`, :phab:`T314560`) * Skip the page if it does not exist * Fix for DiscussionPage.size() (:phab:`T313886`) * Decrease memory usage and improve processing speed -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/824816 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: I095548acdbd1cdc8dfcbaf8067ee18dd7d7c489c Gerrit-Change-Number: 824816 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]: [IMPR] use tools.itertools.itergroup to iterate pairs of elements
by jenkins-bot (Code Review) 19 Aug '22

19 Aug '22

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/823686 ) Change subject: [IMPR] use tools.itertools.itergroup to iterate pairs of elements ...................................................................... [IMPR] use tools.itertools.itergroup to iterate pairs of elements Also add a strict parameter to itergroup function; if True a ValueError is raised if length of iterable is not divisible by size. Change-Id: I815f5011dde9aa77a974b189ba60eaf277a1cd8c --- M pywikibot/tools/itertools.py M scripts/claimit.py M scripts/replace.py M scripts/template.py 4 files changed, 40 insertions(+), 22 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/pywikibot/tools/itertools.py b/pywikibot/tools/itertools.py index 397453f..7d8547d 100644 --- a/pywikibot/tools/itertools.py +++ b/pywikibot/tools/itertools.py @@ -1,4 +1,8 @@ -"""Iterator functions.""" +"""Iterator functions. + +.. note:: ``pairwise()`` function introduced in Python 3.10 is backported + in :mod:`backports` +""" # # (C) Pywikibot team, 2008-2022 # @@ -9,21 +13,25 @@ from contextlib import suppress from itertools import chain, zip_longest +from typing import Any +from pywikibot.backports import Generator from pywikibot.logging import debug from pywikibot.tools import issue_deprecation_warning __all__ = ( - 'itergroup', - 'islice_with_ellipsis', - 'intersect_generators', - 'roundrobin_generators', 'filter_unique', + 'intersect_generators', + 'islice_with_ellipsis', + 'itergroup', + 'roundrobin_generators', ) -def itergroup(iterable, size: int): +def itergroup(iterable, + size: int, + strict: bool = False) -> Generator[Any, None, None]: """Make an iterator that returns lists of (up to) size items from iterable. Example: @@ -39,6 +47,11 @@ Traceback (most recent call last): ... StopIteration + + :param size: How many items of the iterable to get in one chunk + :param strict: If True, raise a ValueError if length of iterable is + not divisible by `size`. + :raises ValueError: iterable is not divisible by size """ group = [] for item in iterable: @@ -47,6 +60,8 @@ yield group group = [] if group: + if strict: + raise ValueError('iterable is not divisible by size.') yield group @@ -192,7 +207,7 @@ return -def roundrobin_generators(*iterables): +def roundrobin_generators(*iterables) -> Generator[Any, None, None]: """Yield simultaneous from each iterable. Sample: diff --git a/scripts/claimit.py b/scripts/claimit.py index 3e1ac09..5bddc26 100755 --- a/scripts/claimit.py +++ b/scripts/claimit.py @@ -52,6 +52,7 @@ # import pywikibot from pywikibot import WikidataBot, pagegenerators +from pywikibot.tools.itertools import itergroup # This is required for the text that is shown when you run this script @@ -126,15 +127,15 @@ claims = [] repo = pywikibot.Site().data_repository() - for i in range(0, len(commandline_claims), 2): - claim = pywikibot.Claim(repo, commandline_claims[i]) + for property_id, target_str in itergroup(commandline_claims, 2): + claim = pywikibot.Claim(repo, property_id) if claim.type == 'wikibase-item': - target = pywikibot.ItemPage(repo, commandline_claims[i + 1]) + target = pywikibot.ItemPage(repo, target_str) elif claim.type == 'string': - target = commandline_claims[i + 1] + target = target_str elif claim.type == 'globe-coordinate': coord_args = [ - float(c) for c in commandline_claims[i + 1].split(',')] + float(c) for c in target_str.split(',')] if len(coord_args) >= 3: precision = coord_args[2] else: diff --git a/scripts/replace.py b/scripts/replace.py index ac97270..cdc730c 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -158,6 +158,7 @@ from pywikibot.bot import ExistingPageBot, SingleSiteBot from pywikibot.exceptions import InvalidPageError, NoPageError from pywikibot.tools import chars +from pywikibot.tools.itertools import itergroup # This is required for the text that is shown when you run this script @@ -979,9 +980,8 @@ # The summary stored here won't be actually used but is only an example site = pywikibot.Site() single_summary = None - for i in range(0, len(commandline_replacements), 2): - replacement = Replacement(commandline_replacements[i], - commandline_replacements[i + 1]) + for old, new in itergroup(commandline_replacements, 2): + replacement = Replacement(old, new) if not single_summary: single_summary = i18n.twtranslate( site, 'replace-replacing', diff --git a/scripts/template.py b/scripts/template.py index 7e83f71..9fc88f0 100755 --- a/scripts/template.py +++ b/scripts/template.py @@ -115,7 +115,12 @@ from pywikibot import i18n, pagegenerators, textlib from pywikibot.bot import SingleSiteBot from pywikibot.pagegenerators import XMLDumpPageGenerator -from pywikibot.tools.itertools import filter_unique, roundrobin_generators +from pywikibot.tools.itertools import ( + filter_unique, + itergroup, + roundrobin_generators, +) + from scripts.replace import ReplaceRobot as ReplaceBot @@ -215,7 +220,6 @@ :param args: command line arguments """ template_names = [] - templates = {} options = {} # If xmlfilename is None, references will be loaded from the live wiki. xmlfilename = None @@ -266,13 +270,11 @@ return if bool(options.get('subst', False)) ^ options.get('remove', False): - for template_name in template_names: - templates[template_name] = None + templates = dict.fromkeys(template_names) else: try: - for i in range(0, len(template_names), 2): - templates[template_names[i]] = template_names[i + 1] - except IndexError: + templates = dict(itergroup(template_names, 2, strict=True)) + except ValueError: pywikibot.output('Unless using solely -subst or -remove, ' 'you must give an even number of template names.') return -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/823686 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: I815f5011dde9aa77a974b189ba60eaf277a1cd8c Gerrit-Change-Number: 823686 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> 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